Corrected Naming Problem

Carrot ammo item renamed in code to fix bug.
Merge branch 'master' of github.com:Crystalix007/LetsModReboot

Conflicts:
	eclipse/logs/2014-08-05-1.log.gz
	eclipse/logs/2014-08-05-2.log.gz
	eclipse/logs/2014-08-05-3.log.gz
	eclipse/logs/2014-08-05-4.log.gz
	eclipse/logs/2014-08-05-5.log.gz
	eclipse/logs/2014-08-05-6.log.gz
	eclipse/logs/2014-08-05-7.log.gz
	eclipse/logs/latest.log
	eclipse/saves/Test/DIM-1/data/villages.dat
	eclipse/saves/Test/DIM1/data/villages.dat
	eclipse/saves/Test/data/villages.dat
	eclipse/saves/Test/level.dat
	eclipse/saves/Test/level.dat_old
	eclipse/saves/Test/playerdata/040a63f0-e153-3f49-84a8-b60ca564e69f.dat
	eclipse/saves/Test/region/r.0.-1.mca
	eclipse/saves/Test/region/r.0.0.mca
	eclipse/saves/Test/session.lock
	eclipse/saves/Test/stats/040a63f0-e153-3f49-84a8-b60ca564e69f.json
	src/main/resources/assets/letsmodreboot/lang/en_US.lang