Simple devise login.
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.
Add some devise tests and login form.
Add dropdown for current user.
Merge branch 'master' into devise

* master:
  Migrate database when deploying.
Merge branch 'master' into devise

* master:
  Add staging environment.
Bootstrap login page.
Merge branch 'master' into devise

* master:
  Add pry to other environments also.

Conflicts:
	Gemfile
Update bundle.
Add all changes at once.
Merge branch 'devise' into hboehm

* devise:
  Add all changes at once.
  Update bundle.
  Bootstrap login page.
  Add dropdown for current user.
  Add some devise tests and login form.
  Add login form and link to secured area.
  Simple devise login.

Conflicts:
	Gemfile.lock