changes to device module
Merge branch 'milestone6' of https://github.com/WSO2Mobile/mdm into milestone6

Conflicts:
	modules/device.js