merging changes
Merge branch 'master' of github.com:WSO2Mobile/mdm

Conflicts:
	cont/groups.jag
	cont/users.jag