Merge branch 'bugfix/upgrade' into develop

rowers/braintreestuff.py

@@ -1,7 +1,7 @@
 import braintree
 from django.utils import timezone
 import datetime
-
+import sys
 import django_rq
 queue = django_rq.get_queue('default')
 queuelow = django_rq.get_queue('low')

rowers/tasks.py

@@ -1738,6 +1738,8 @@ def handle_sendemailnewresponse(first_name, last_name,
     from_email = 'Rowsandall <info@rowsandall.com>'
     subject = 'New comment on workout ' + workoutname
 
+    comment = u''+comment
+    
     siteurl = SITE_URL
     if debug:
         siteurl = SITE_URL_DEV
@@ -1775,6 +1777,8 @@ def handle_sendemailnewcomment(first_name,
     from_email = 'Rowsandall <info@rowsandall.com>'
     subject = 'New comment on workout ' + workoutname
 
+    comment = u''+comment
+    
     siteurl = SITE_URL
     if debug:
         siteurl = SITE_URL_DEV

rowsandall_app/urls.py

@@ -33,7 +33,6 @@ handler500 = 'rowers.views.error500_view'
 
 
 urlpatterns = [
-    url(r'^admin/jsi18n', 'django.views.i18n.javascript_catalog'),
     url('^', include('django.contrib.auth.urls')),    
     url(r'^django-rq/',include('django_rq.urls')),
     url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'),