Fix merge

store/forms.py

store/models.py

store/routes.py

store/static/main.css

store/static/oldmain.css

store/templates/base.html

store/templates/login.html

store/templates/userContent/ChangeEmail.html

store/templates/userContent/ChangePhNumber.html

store/templates/userContent/ChangeUsername.html

store/templates/userContent/account.html

store/templates/userContent/accountDetails.html

store/templates/userContent/admin.html

store/templates/userContent/login.html

store/templates/userContent/register.html

store/templates/userContent/reset_password.html

store/templates/userContent/reset_password_confirm.html

store/templates/userContent/reset_security1.html

store/templates/userContent/user.html

store/templates/userContent/verify_code.html