fixed some bugs with permissos
Merge branch 'integration-v0.1' into develop