Merge branch 'master' of https://github.com/notenoughdata/harbor

Conflicts:
	app/assets/stylesheets/application.css