My Version
Oh yeah
Merge branch 'Moogle'

Conflicts:
	.gitignore
	pom.xml
	src/main/resources/lang/srm_de.properties
	src/main/resources/lang/srm_en.properties