ui unification
Merge branch 'master' of https://github.com/soad003/flatman
Merge branch 'master' of https://github.com/soad003/flatman
ui shopping, div