Django2.0

Merged svilayphiou requested to merge django2.0 into master

Merge request reports