Fixes to roles and users pages
Merge branch 'rc2' of github.com:WSO2Mobile/mam into rc2

Conflicts:
	client/js/users/configuration.js