Fix for glyphicons in admin.
Merge branch 'glyphicons-fix' into puzzel-en-win

Conflicts:
	core/app/assets/stylesheets/brightcontent/brightcontent.css.erb