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

Conflicts:
	modules/mam.js