commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	WZWVDLL/WZWVDLL/Core/DatabaseHandler.cs