Re-add font-awesome. It is indeed awesome.

Conflicts:
	app/assets/stylesheets/main.less