improve sign-in form
Merge branch 'shop' of https://github.com/osen-web-development/cmf into shop