Added several UI classes and modified the GameManager class
Fixing overwrites
Merge origin/master