[#601] Migrate client_id to org_id & major cleanup#602

mladen-inabyte wants to merge 13 commits intodeveloprokwire/groups-building-block:developfrom

601-migrate_client_idrokwire/groups-building-block:601-migrate_client_idCopy head branch name to clipboard