Backend

Merged André Anjos requested to merge backend into master

Merge request reports