Turn into a phonegap project
Merge branch 'master' into phonegap

Conflicts:
	www/index.html
Removed unneeded build files
Merge branch 'master' into phonegap