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

Conflicts:
	api/deviceRouter.js
Merge branch 'alpha2' into alpha1