some little changes
 Merge branch 'master' of https://github.com/tibudget/tibudget-test

Conflicts:
	src/main/java/com/tibudget/tests/utils/CollectorTestApplication.java