Merge branch 'zh-patch' into locate-zh

Conflicts:
	.gitignore
	src/main/java/me/zford/jobs/i18n/Language.java