Merge branch 'master' into newStructure
new structure
new html
Merge remote-tracking branch 'origin/api-config' into newStructure
Merge branch 'api-config' into newStructure

Conflicts:
	viastore-web/src/main/webapp/viastore/js/modules/page/content/parts/productsItems.js
modified module page
Merge branch 'api-config' into newStructure
new modules for header
new tools
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
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
page structure revisited
nre template "ZEUS"
Merge branch 'newStructure' of github.com:gsmirnoff/marketing into newStructure
templateGenerator
to be continued...
tools u[date
Merge branch 'newStructure' into user-personal

Conflicts:
	viastore-web/src/main/webapp/index.html
	viastore-web/src/main/webapp/main/tools/Reguest.js
	viastore-web/src/main/webapp/viastore/js/tools/Tools.js
routes login and account