delete phonegap
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/config.xml
Merge branch 'master' of https://github.com/farbod-s/Watch-Out