Upgrade the gemfiles to stay up to date
Merge branch 'master' of github.com:pothibo/ecrire
Merge branch 'master' into marmite

Conflicts:
	Gemfile
	Gemfile.lock
Fixed problem with login screen.