front-end fixes
Merge branch 'master' of https://github.com/brotherclone/imaginary

Conflicts:
	app/assets/stylesheets/imaginary-icons.css.scss