added quotes
Merge remote-tracking branch 'origin/master' into quotes
quotes part 2
removed rmash lite routing option
Merge branch 'quotes'

Conflicts:
	app/views/layouts/application.html.haml
	app/views/voting/home.html.haml
	config/routes.rb
	db/schema.rb
small fixes
css fix with footer
removed invalid mail notice
changed title
added option to lock categories
removed links from start page
added mail for contact form and change password
added reset password mail and contact mail
fix for change password form
Merge branch 'mail_fix'
fixed password reset bug fix
Revert "fixed password reset bug fix"

This reverts commit e30abfbd243ddb8b18d089db69b1ae33c3ac7533.
fixed password reset bug
added project goes live fonctionality