More changes for win64/32 building
Merge branch 'master' of https://github.com/coyote1357/OpenKJ

Conflicts:
	OpenKJ.pro.user