Merge branch 'ui-bootstrap-2' into setadmin
merging
Merge branch 'setadmin' of https://github.com/sharewave/frontus into setadmin

Conflicts:
	cmn/directives.js
added new modal for altering role
Merge branch 'setadmin' into testing