Refactoring and adding unit tests
Merge branch 'master' of https://github.com/simtetu/GameTheater.git