Merge remote-tracking branch 'upstream/master' into increase-coverage

* upstream/master:
  Adding tests for submit function based views.
  Moving result from function based view to class based view.

Conflicts:
	teamtemp/tests/views/test_admin_views.py