Initial work on Block handling improvement
Cleaned up block properties
Brought out World as a top level package, moved blocks and block shapes under world
Changed blocks and block families to be identified by a BlockUri
Added BlockPart enumeration, for specifying the different parts of a block
Added block definition and block tile support to asset system
Moved block type loading into StateSinglePlayer, allowing blocks to be loaded from mods.
Removed Groovy block definitions and loaders
Added initial support for JSON blocks
Added some core block definitions
Fixed bug with entities not remembering their prefab
Changed EnumBooleanMap to be implemented over an EnumSet
Added support for Horizontal block family loading
Some tweaks to the JSON format
Implemented AlignToSurface block loading
Added dispose method for assets
Started working towards persistence of block uri <-> id map in worldinfo
Added block definitions back in for merge
Merge branch 'develop' of git@github.com:MovingBlocks/Terasology.git into mod-arc

Conflicts:
	src/main/groovy/org/terasology/data/blocks/definitions/plant/BigBrownShroom.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/Cotton1.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/Cotton2.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/Cotton3.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/Dandelion.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/DeadBush.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/Glowbell.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/GlowbellBloom.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/Iris.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/Lavender.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/RedClover.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/RedFlower.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/Tulip.groovy
	src/main/groovy/org/terasology/data/blocks/definitions/plant/YellowFlower.groovy
	src/main/groovy/org/terasology/model/blocks/management/BlockManifestor.groovy
	src/main/java/org/terasology/entityFactory/PlayerFactory.java
	src/main/java/org/terasology/game/modes/StateSinglePlayer.java
	src/main/java/org/terasology/world/WorldInfo.java
	src/main/java/org/terasology/world/WorldProviderCoreImpl.java
	src/main/java/org/terasology/world/generator/core/FloraGenerator.java
	src/main/java/org/terasology/world/generator/persistence/ChunkGeneratorJSONFormat.java
	src/main/java/org/terasology/world/generator/persistence/ChunkGeneratorPersister.java
Block <-> Id map now persisted in WorldInfo, so the world can correctly respond to block changes.
WorldInfo is now used to initialise StateSinglePlayer.
Updated all block definitions to use json format, distributed them to mods where appropriate
Added auto directory support to load a block tile directly as a block (put one or more auto directory anywhere under a blocktiles directory)
Merge branch 'mod-arc' into develop

Conflicts:
	mods/minerals/blocks/mineral/Gabbro.json
	src/main/java/org/terasology/asset/AssetType.java
	src/main/java/org/terasology/game/TerasologyEngine.java
	src/main/java/org/terasology/rendering/gui/components/UIInventoryCell.java
	src/main/java/org/terasology/rendering/gui/components/UIInventoryCellNew.java
	src/main/java/org/terasology/rendering/gui/components/UIToolbarCell.java
	src/main/java/org/terasology/rendering/gui/dialogs/UIDialogCreateNewWorld.java
Merge branch 'develop' of git@github.com:MovingBlocks/Terasology.git into develop

Conflicts:
	src/main/java/org/terasology/componentSystem/controllers/DebugControlSystem.java
merge