Customer edit
Merge branch 'develop' of https://github.com/Ceddy/upinhair into develop
Merge branch 'develop' of https://github.com/Ceddy/upinhair into develop