Merge pull request #26 from OndrejKuchta/feature/finaldesign

terms popup fix
Merge branch 'master' into feature/finaldesign