Adjusts water clip plane and disable water reflections for all block sides but the top (this fixes #406).
Fix for #408 - water surfaces flickering
Added new integer matrix. (Matrix4i)
Add merge method to BlockCollection.
  - This makes it easier to combine two collections to a new one, e.g. when constructing structures from smaller parts.
Made resolveBlockUri method public,static to make it usable for other commands that deal with blocks.
Grammar test suite update:
  - added test cases for split rules
  - added more test cases for the other rules
  - moved the building generator test into tests (tests combination of rules)
Big Grammar System update:
 - restructured logic.grammar for more clarity of different rules
 - corrected a lot of smaller bugs
 - removed CoordinateSystem class
 - completely using Matrix4i for orientation/translation handling
 - changed rule map from ShapeSymbol to Strings as keys
 - added BuildingCommands class containing some testing commands for building generation
Merge branch 'develop' of git://github.com/MovingBlocks/Terasology into develop

Conflicts:
	src/main/java/org/terasology/model/structures/BlockCollection.java