tanya does what tanya does
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/db_access_layer/managers/impl/DepositManagerImpl.java