Merge pull request #6 from lergo/lergo-48

Lergo 48
Merge branch 'master' of https://github.com/lergo/lergo-ui into develop