Merge tag 'micfont' into develop

Mic fonts added

* tag 'micfont':
Merge branch 'hotfix/css_down' into develop

* hotfix/css_down:
  put stylesheets up
Merge branch 'develop' of github.com:ulmic/mic_event into develop

* 'develop' of github.com:ulmic/mic_event:
  micfont added
  Favicon added

Conflicts:
	app/views/layouts/application.html.haml
up bootstrap_overrides
Merge branch 'develop'

* develop:
  up bootstrap_overrides

Conflicts:
	app/views/layouts/application.html.haml