Update ForgeGradle to 1.2 and Forge to 1048
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	build.gradle