BulkLoader step 1
Merge branch 'master' of https://github.com/flyingSkull/configurator

Conflicts:
	src/com/flyingskull/configurator/client/imageLoader/ImageLoaderService.java