Test DB Connection and JSON data parsing
Merge branch 'master' of https://github.com/overTheTos/PeppersWorld.git

Conflicts:
	assets/www/index.html