Fixed a pom error
Fixed conflicts
Merge branch 'develop' of github.com:wso2-dev/product-emm into develop

Conflicts:
	modules/apps/emm/controller/app.js
	modules/apps/emm/ios_utils/checkin.jag
	modules/p2-profile-gen/pom.xml