Merge branch 'feature-function'
Merge branch 'feature-function'
popup high resolution fix, ie9 fix
Merge branch 'master' into feature/finaldesign
5000 reminder
Merge pull request #23 from OndrejKuchta/feature/finaldesign

Feature/finaldesign
Merge branch 'master' into feature-function

Conflicts:
	js/app.js