Merge branch 'master' into feature/finaldesign
popup fixes
Merge branch 'master' into feature/finaldesign
Merge pull request #27 from OndrejKuchta/feature/finaldesign

Feature/finaldesign