#BFM-9 fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/services/dao/impl/CustomerJdbcDAOTest.java