Update Version
Update version
Merge remote-tracking branch 'origin/master' into v2.0

Conflicts:
	common/k2b6s9j/BoatCraft/BoatCraft.java
	resources/mcmod.info
Merge remote-tracking branch 'origin/v2.0' into SailorsBackpack

Conflicts:
	common/k2b6s9j/BoatCraft/BoatCraft.java
	resources/mcmod.info