App policy fixes. MAM fix for admins
Merge branch 'alpha4' of github.com:WSO2Mobile/mdm into alpha4

Conflicts:
	modules/device.js
Merge branch 'alpha4' of github.com:WSO2Mobile/mdm into alpha4

Conflicts:
	modules/device.js