Add Terrain_flag and Item_flag modifiers to fields.  Add flags to items (Item_flag).  Add TF_WATER Terrain_flag.
Merge branch 'master' of github.com:Whales/Cataclysm2