Merge https://github.com/jorgeer/dontpanic

Conflicts:
	server/js/engine.js
Mergin sum stuff