changes to roles message
merging
edit policies
merge
added apis
Merge branch 'milestone6' of github.com:WSO2Mobile/mdm into remotes/origin/milestone6

Conflicts:
	index.jag
Merge branch 'milestone6' of github.com:WSO2Mobile/mdm into remotes/origin/milestone6
changes to policies edit
changes to policies edit
added policy type
merging
Merge branch 'milestone6' of github.com:WSO2Mobile/mdm into milestone6
merging
changes to policies edit
merging
Merge branch 'milestone6' of github.com:WSO2Mobile/mdm into milestone6
merging
merging
changes to policy type
Merge branch 'milestone6' of https://github.com/WSO2Mobile/mdm into milestone6