+ added content manager
* encapsulated the game logic in an extra class
Merge branch 'master' into develop