visualization
Merged fixed confilct.
Merge branch 'master' of github.com:policycompass/policycompass-frontend