Updated Rails and other gems - reset password tokens invalidated

Devise updated. Previous reset password tokens in the database do not
work after this change. If resetting passwords is enabled it is
recommended to enable the unsafe method in production for a day or so
that reset emails already sent out work. See
http://blog.plataformatec.com.br/2013/08/devise-3-1-now-with-more-secure-defaults/
for more information.
Merge branch 'dev'

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/devise.rb
Set username per stage