Frontend dev

Felix Sagerrequested to merge
frontend_dev into master

Merge request reports