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
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