Merge branch 'master' of github.com:itarasenko/111

Conflicts:
	sql/Fix_Invoice_Processing_Amount.sql

git-svn-id: http://di-svn.dataintensity.com/svn/BS/BlackStone/trunk@3122 a9b002e1-f7d1-46a0-a87c-dcac604474c7
Merge branch 'master' of github.com:itarasenko/111