local
Merge branch 'master' of https://github.com/vinin3/nxc_bank.git

Conflicts:
	common/src/main/java/org/common/atms/Atms.java