Merge branch 'master' of https://github.com/dejno/On-Behalf

Conflicts:
	less/styles.less
	public/css/styles.css