Configure ActionMailer.
Switch to bootstrap3.

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
Merge branch 'master' into devise-with-bootstrap3

* master:
  Switch to bootstrap3.
  Configure ActionMailer.

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
Add login form and link to secured area.