Merge branch 'hotfix/css_down'

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

* 'master' of github.com:ulmic/mic_event:
  micfont added
  Favicon added
  Capi logs hotfix
  log copy fix
  Capistrano log access added
  migrate task added
  Capistrano and unicorn configs added

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

* develop:
  up bootstrap_overrides

Conflicts:
	app/views/layouts/application.html.haml
db is now on postgres
Merge branch 'hotfix/db_pg' into develop

* hotfix/db_pg:
  db is now on postgres