Less support
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
	public/css/bootstrap.css
	public/css/bootstrap/_theme.css