Manual merge of Map Generation

Merged but with errors in the entities package. Requiring merge of
entities branch.
Manual merge of ItemsDemo to master
Revert "Manual merge of ItemsDemo to master"

This reverts commit 4ae0406758e19b0df60cc8182269febb83fbc841.
Merge pull request #8 from apepers/ControllerStructure

Controller structure
Fixed Tile errors

Fixed up the errors with the Tile class being moved to Entities, and
restored some functions that had gone missing in the merge.
Merge pull request #9 from apepers/master

Update ControllerStructure Branch