Merge branch 'develop' into feature/homepage2

Close #103
Merge branch 'develop' of https://github.com/jackjonesfashion/JJ-CSS into develop