change
Merge remote-tracking branch 'origin/master'

Conflicts:
	module/Design/view/design/page/index.phtml