Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaFiles/NeatHelper/src/data/CommandCollection.class
	JavaFiles/NeatHelper/src/data/SendResourcesCommand.class