Merge branch 'master' of https://github.com/fr151/johannjs

Conflicts:
	app.js
	assets/views/index.html
changes to client
fix merge conflicts