preparation for shipping options addition
refactoring step4
Merge branch 'master' into step4

Conflicts:
	css/main.css
Merge branch 'master' into step4