cms_helper_test: remove useless test and link to override
user_mailer_test: remove randomness from test
Merge branch 'stable' of git://gitorious.org/noosfero/noosfero into travis

Conflicts:
	config/environment.rb
Merge branch 'travis' of git://github.com/coletivoEITA/noosfero-ecosol into travis

Conflicts:
	config/environment.rb