Merge remote-tracking branch 'origin/master'

Conflicts:
	src/shade/src/resource/Resource.java
Merge remote-tracking branch 'origin/master'