Merge branch 'master' into phonegap

Conflicts:
	www/index.html