Merge branch '1.6.4'
Reorganized the fishing module
Constants have to be named with upper case letters
Merge branch 'master' into 1.6.4

Conflicts:
	common/industrialscience/modules/fishing/FishingBlock.java

common/industrialscience/modules/fishing/TileEntities/AbstractFishTrapTi
leEntity.java

common/industrialscience/modules/fishing/TileEntities/BasicFishTrapTileE
ntity.java

common/industrialscience/modules/fishing/TileEntities/BasicLobsterTrapTi
leEntity.java

common/industrialscience/modules/fishing/TileEntities/TrapCraftingTableT
ileEntity.java