changed some stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/assets/advancedtools/lang/en_US.lang
Merge remote-tracking branch 'origin/master'