Code formatting
Merge branch 'master' of https://github.com/Team-NEO/ModJam

Conflicts:
	src/com/teamneo/modjam/misc/Language.java