Fix for loading resources
Resources would load dependent on the location of Shade, not the implementation.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/shade/src/resource/Resource.java