modified:   app/assets/stylesheets/scaffolds.css.scss
	modified:   app/helpers/devise_helper.rb
	modified:   config/application.rb
Merge pull request #118 from scoccia/dev/davide_di_carlo/fix_bugs

Dev/davide di carlo/fix bugs