Merge origin/master

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

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

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

Conflicts:
	module/Application/view/layout/layout.phtml
	public/css/style.css