AccountOrderHis AccountDiscount
Merge remote-tracking branch 'origin/master'

Conflicts:
	AccountOrderHis.html
	AccountPassword.html

yup
Merge branch 'master' of https://github.com/ekinsigic/Limart