Merge pull request #9 from apepers/master

Update ControllerStructure Branch
Merge pull request #10 from apepers/master

Cleanup
Fixed warnings

Fixed some small warnings in entities.
Merge pull request #11 from apepers/ControllerStructure

Controller structure