Feature/django upgrade

@rumca here's the big one :wink: Test plans to be written in the issues, where relevant.