commit before merge
Merge branch 'master' of https://github.com/ojessen/ojUtils

Conflicts:
	src-i386/ojUtils.dll
	src-x64/ojUtils.dll
Rebuild after pull.