Merge origin/master

Conflicts:
	module/Application/view/layout/layout.phtml
Merge origin/master