isCordovaApp-Update
Merge branch 'develop' of https://github.com/pixelpark/ppnet into develop

Conflicts:
	app/scripts/controller/loginController.js