production server: remove unneeded routes
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge commit 'dc07d866ce5c063270360cd7c6c34d4de3431b8e' from branch master into production

Conflicts:
	config/routes.rb
Merge branch 'master' into production
add embedded.css to precompile
add blueimp-gallery.js to precompile
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production