home
Merge branch 'master' of https://github.com/sergvcx/fnm

Conflicts:
	DealCollectorQT/TransaqConnector.cpp