surfshop v1.5.4
Merge branch 'master' of https://github.com/surfshopcart/surfshop

Conflicts:
	README.md
	TO DO.txt