Merge branch 'master' into newStructure

Conflicts:
	viastore-web/src/main/webapp/js/modules/page/header/header.js
	viastore-web/src/main/webapp/js/modules/page/page.js
	viastore-web/src/main/webapp/viastore/js/tools/Tools.js
nre template "ZEUS"
Merge branch 'newStructure' of github.com:gsmirnoff/marketing into newStructure