admin-permissions
admin-permissions
Merge remote-tracking branch 'origin/master' into confPermissions

Conflicts:
	app/index.html
permissions js
Merge pull request #135 from CruGlobal/confPermissions

Conf permissions