A
Merge remote-tracking branch 'origin/master'

Conflicts:
	addshop.php
Merge branch 'master' of https://github.com/mz121star/expressshop
Merge branch 'master' of https://github.com/mz121star/expressshop
Merge branch 'master' of https://github.com/mz121star/expressshop
A
Merge remote-tracking branch 'origin/master'