depositbox file changed
Merge branch 'master' of https://github.com/otarazan/homy

Conflicts:
	homy/app/controllers/Deposit.java
	homy/db/h2/play.h2.db
	homy/db/h2/play.lock.db
	homy/db/h2/play.trace.db