commit for update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/logic/DataStorage.cpp
	Classes/logic/DataStorage.h
Merge branch 'master' of https://github.com/Uaman/ATM

Conflicts:
	Classes/logic/DataStorage.h