Merge branch 'master' into testing

Conflicts:
	views/layout.jade