update
Merge remote-tracking branch 'origin/master'

Conflicts:
	basket.php
	css/responsive.css