working on tests for solicitacoes controller
Merge branch 'master' of github.com:sikora/siac

Conflicts:
	test/test_helper.rb