Fixed comments.
Merge.
Merge branch 'master' of github.com:letsdrink/ouzo-app