Change test unit template
Remove parenthesis in user controller
Remove parenthesis in password resets controller
No more fixed version for capistrano-rbenv
Use encrypted cookie for auth_token
Merge ../x0y0

Conflicts:
	Gemfile.lock
	app/controllers/password_resets_controller.rb
	test/test_helper.rb