Merge commit '71dc9c39d47efeb7d955c8519ca00b59abd1a208' into HEAD

Conflicts:
	module/Application/view/application/index/index.phtml
	module/Application/view/layout/layout.phtml