.
Merge branch 'master' of github.com:oskolsky/markup_samsung