Added for wait to jQuery
Email validation added
WIP to fix perfec pixel
Tab order fixed
Pixel perfect fixed and footer fixed in mobile displays
Link to MagmaConf added
Images changed
WIP to add the cancel button
Cancel button fixed
Add translations on proposal level
Profile update text in spanish
prevent duplicate confirm
Set ruby 2.0
Add email initializer
Use the master branch of the cfp gem repo
Once again, update to the latest cfp gem version
Use the master branch of the cfp gem repo
Once again, update to the latest cfp gem version
Merge branch 'master' into 2014

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.haml
	app/views/layouts/cfp/application.html.haml