Check also the text body in user mailer test
Test helper cleanup
Merge ../x0y0

Conflicts:
	test/mailers/user_mailer_test.rb
	test/test_helper.rb