fixes
Merge commit '46cd3922eeb02b85a0c534a5b4768096d4105db7'

* commit '46cd3922eeb02b85a0c534a5b4768096d4105db7':
  organization ids fixed

Conflicts:
	resources/organization.py
More fixes