Remove unnecessary stuff from seeds
Add proper headers
Precompile assets
Clean assets
Merge branch 'master' into custom
Precompile assets
Merge branch 'master' into custom
Precompile assets
Merge branch 'master' into custom
Precompile assets
Merge branch 'master' into custom

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/_navbar.html.erb
	app/views/layouts/application.html.erb
Merge branch 'master' into custom
Precompile assets
Force ruby 2 on heroku
Merge branch 'master' into custom
Precompile assets
Merge branch 'master' into custom
Merge branch 'master' into custom
Precompile assets
Dirty fix for assets problems