edit by ahmet
Merge branch 'master' of https://github.com/sdisoftware/ERPReporter.git

Conflicts:
	src/com/sdi/erpreporter/ActQuery.java