belachelijk
Merge remote-tracking branch 'origin/master'

Conflicts:
	SteampunkyClient/build/built-jar.properties
	SteampunkyClient/nbproject/private/private.xml
	SteampunkyServer/build/built-jar.properties
	SteampunkyServer/nbproject/private/private.xml