Refactoring
Refactoring

Changed for Rails 4
Add categories list of works to seed data for order
Fix fail bug
Merge branch 'master' into Admin

Conflicts:
	app/helpers/application_helper.rb
	app/models/user.rb
	app/views/layouts/application.html.erb
	config/initializers/mime_types.rb