Merge branch 'develop' into contestpage

Author: abarya

oshc/main/views.py

@@ -7,6 +7,9 @@
 
 from django.shortcuts import render_to_response
 
+from django.template import RequestContext
+from django.shortcuts import render_to_response
+
 from django.template import RequestContext