Merge branch 'Features/organization' into develop
* Corrected error from google - wrong api keys
Merge branch 'develop' into Features/organization