updates
Merge branch 'HEAD' of https://github.com/DalKinz/PhoneGapBuildExample.git

Conflicts:
	www/controllers/main.js