Java dependency Injection (Guice)
Merge branch 'master' of https://github.com/Serli/swear-box

Conflicts:
	app/controllers/Welcome.java
	app/dao/ConsumerDAO.java
	app/dao/PersonDAO.java