fixes
Merge branch 'master' of https://github.com/Crowdcomputer/CC

Conflicts:
	restapi/permissions.py