Using the dependency injection in the tests
Merge branch 'master' of https://github.com/Serli/swear-box

Conflicts:
	app/dao/ConsumerDAOImpl.java
	test/unit/UpadteAmountUserTest.java