oleg, forced to commit before update...
Merge branch 'master' of github.com:zollder/app
Merge branch 'master' of github.com:zollder/app