Integrated Font Awesome
Merge remote-tracking branch 'origin'

Conflicts:
	less/mockup.less
	less/toolbar.less