Installing Jade
Merge branch 'master' into sass-bourbon

Conflicts:
	dist/client.js
	dist/templates/water-all.html