Merge branch 'master' into funding

diff --cc apps/wolnelektury_core/views.py
index 7f29401,ae582ce..77cd016
--- 1/apps/wolnelektury_core/views.py
--- 2/apps/wolnelektury_core/views.py
+++ b/apps/wolnelektury_core/views.py
@@@ -90,11 -89,12 +89,12 @@@ def logout_then_redirect(request)
      return HttpResponseRedirect(urlquote_plus(request.GET.get('next', '/'), safe='/?='))
  
  
+ @never_cache
  def clock(request):
 -    """ Provides server time for jquery.countdown,
 +    """ Provides server UTC time for jquery.countdown,
      in a format suitable for Date.parse()
      """
 -    return HttpResponse(datetime.now().strftime('%Y/%m/%d %H:%M:%S'))
 +    return HttpResponse(datetime.utcnow().strftime('%Y/%m/%d %H:%M:%S UTC'))
  
  
  def publish_plan(request):

diff --cc requirements.txt
Simple merge

diff --cc wolnelektury/settings/__init__.py
Simple merge