Merge branch 'hotfix/add_application_css'

* hotfix/add_application_css:
  fix assets
Merge branch 'develop'

* develop:
  add favicon
Merge branch 'develop'

* develop:
  edit link to favicon
Merge branch 'develop'

* develop:
  edit web/application.css
  add application stylesheet
Merge branch 'develop'

* develop:
  remove web/styles
Merge branch 'develop'

* develop:
  add application.js
Merge branch 'develop'

* develop:
  replace fonts
edit config
Merge branch 'develop'

* develop:
  fix fonts
  replace fonts

Conflicts:
	config/environments/production.rb
fix images
fix images
add other images
Merge branch 'hotfix/fix_images' into develop

* hotfix/fix_images:
  add other images
  fix images
  fix images
  edit config