Proper devise mail messages
Merge pull request #25 from vircung/feature/emails

Mail messages
Translations
Typo in models
Fix tests
Gem rails-i18n
Settings for Heroku
View folder revisited
Merge branch 'feature/wip' into develop

Conflicts:
	app/views/devise/mailer/confirmation_instructions.html.erb
	app/views/devise/registrations/new.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/devise/shared/_links.erb
	app/views/layouts/_toolbar.html.erb
	app/views/profiles/index.html.erb
	app/views/profiles/show.html.erb
Merge pull request #27 from vircung/develop

Major project changes