WIP basic overview templates, page layout, ...
Merge branch 'develop' of https://github.com/vivoportal/v2 into feature/frontend
WIP basic overview templates, page layout, updated bootstrap...
WIP basic overview templates, page layout, updated bootstrap...
Merge branch 'develop' of https://github.com/vivoportal/v2 into feature/frontend
Merge branch 'develop' of https://github.com/vivoportal/v2 into feature/frontend
WIP - update of FE views of overviews, new vmodules - jquery, ...
Merge branch 'develop' of https://github.com/vivoportal/v2 into feature/frontend
WIP - FE views of carousel overview
Security manager in CMS api - WIP
Fix call methods with alert component in save action
Security manager used in CMS API, Security Manager initializer
Merge pull request #184 from dlu-gs/feature/cmsapi-secman

Feature/cmsapi secman
Merge pull request #185 from miroslavhajek/feature/backend

Feature/backend
Merge pull request #187 from zstanek/feature/frontend

Feature/frontend
Merge branch 'develop' into feature/backend

Conflicts:
	module/Vivo/view/Vivo/UI/Page.phtml
Merge branch 'feature/backend' of github.com:vivoportal/v2 into feature/backend
Backend bootstrap moved to SiteManager
Merge remote-tracking branch 'v2/feature/backend' into feature/backend-modules
Merge pull request #188 from dlu-gs/feature/backend-modules

Feature/backend modules