list html
assets fixes
Merge pull request #1 from piotras-s/fixing_marej

Assets paths fixes
list
Merge remote-tracking branch 'upstream/devel' into devel

Conflicts:
	composer.json
	composer.lock
Register repositories as services
Merge remote-tracking branch 'marej/devel' into feature-activity-controller
list - update
Merge remote-tracking branch 'marej/devel' into feature-activity-controller
Add initital version of twig templates
Merge pull request #2 from galileo/feature-activity-controller

Feature activity controller
login form
search page
Merges with marej
Merge pull request #3 from galileo/feature-activity-controller

Feature activity controller
few fixes
resolved conflicts
cr fixes #1
template path fixes
Merge pull request #33 from piotras-s/marej_devel

Marej devel