New version update

New features, as well as fixes
Merge branch 'master' of https://github.com/surfshopcart/surfshop

Conflicts:
	Requirements.md
	surfshop/admin.cgi
	surfshop/ss_files/Emailer.pm
	surfshop/ss_files/SSLib.pm
	surfshop/ss_files/timezones.pl