Reformatted the project.
Merge remote-tracking branch 'origin/master'

Conflicts:
	common/net/minecraftforge/inventory/IInventoryHandler.java