removed a stray comma
Merge commit 'fbedf5e098fe31795ece541840c08e43467fa012'

* commit 'fbedf5e098fe31795ece541840c08e43467fa012':
  organization API working
Fix python not running
Merge commit '77180067dbe222d9cffccd545dc500b718bcc7c4'

* commit '77180067dbe222d9cffccd545dc500b718bcc7c4':
  small testing fixes

Conflicts:
	manager.py