Make Jenkins use custom test runner (DiscoveryRunner)

Without this Jenkins finds no tests to run.
Change the urls.py to use the new django-registration views
Change to use assing_perm instead of assign.

This makes it compatible with the latest version of django-guardian
Add a small gap between feedback comments
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	django/econsensus/local_settings.py.jenkins
	django/econsensus/settings.py
Merge branch 'upgrade_software' into develop

Conflicts:
	django/econsensus/urls.py