Design. version 2.0 )
Merge remote-tracking branch 'origin/master'

Conflicts:
	store/templates/layout.html