-
Merge branch 'master' of github.com:sundowndk/Didius

Conflicts:
	Binary/AppDebug/Didius.dll
	Binary/AppDebug/app/Didius/application.ini
	Source/Didius.userprefs
	Source/Didius/Application/xul/application.ini
	Source/Didius/Application/xul/chrome/content/auction/run.xul