merging
Merge branch 'milestone5' of github.com:WSO2Mobile/mdm into milestone5

Conflicts:
	controller/roles.js