Object en powerup aangepast
Merge remote-tracking branch 'origin/master'

Conflicts:
	SteampunkyClient/nbproject/private/private.properties