Fixed stuff for 1.7.10
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.gradle
	src/main/resources/mcmod.info