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

Conflicts:
	policy.txt