a
Merge branch 'master' of https://github.com/ozaki-digilab/phonegap-start

Conflicts:
	www/index.html