final version of TestApp
Merge branch 'master' of https://github.com/YuryYaroshevich/TestApp