first commit
Merge remote-tracking branch 'admin/master' into new_interface

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
	app/controllers/application_controller.rb
	app/controllers/home_controller.rb
	app/views/layouts/application.html.haml
	app/views/layouts/login.haml
	config/application.rb
	config/database.yml
	config/initializers/session_store.rb
	config/routes.rb
	config/secrets.yml
	db/seeds.rb
merge con nuova interfaccia