Commit 35
Merge branch 'master' of https://github.com/tattyseal/Modjam4

Conflicts:
	src/main/resources/assets/eep/lang/en_US.lang