Double tap!
Merge branch 'master' into feature/dsButtonDouble

Conflicts:
	client/jade/index.jade
	client/js/module.js
Merged everything from Weyland & master + formatted all client code with webstorm (tabs + default config)