beta
Merge branch 'master' of https://github.com/SESI-Phonegap/GEOBOOK

Conflicts:
	index.html