Phonegap build.
Merge branch 'master' of https://github.com/bthj/Phosom-client

Conflicts:
	index.html