Work on figuring out this bs npe
Merge branch 'master' of https://github.com/Team-NEO/ModJam

Conflicts:
	resources/assets/teamneo/lang/en_US.properties
	src/com/teamneo/modjam/blocks/Blocks.java
	src/com/teamneo/modjam/misc/Language.java