Merge branch 'view-refactor' of stigma:platforma into zuber-view-refactor