no message
Merge branch 'master' of https://github.com/bippi/phonegaptest

Conflicts:
	index.html