Merge branch 'dev' into 'master'

Dev

See merge request !85

courses/models.py

@@ -79,13 +79,19 @@ class CourseManager(models.Manager):
         kwargs['teacher_tokens'] = teachers
 
         if image:
-            kwargs['image'] = decode_base64(image, 'course/image%s.png' % slug)
+            path = 'course/image%s.png' % slug
+            decode_base64(image, path)
+            kwargs['image'] = path
 
         if big_image:
-            kwargs['big_image'] = decode_base64(big_image, 'course/big_image%s.png' % slug)
+            path = 'course/big_image%s.png' % slug
+            decode_base64(image, path)
+            kwargs['big_image'] = path
 
         if big_mobile_image:
-            kwargs['big_mobile_image'] = decode_base64(big_mobile_image, 'course/big_mobile_image%s.png' % slug)
+            path = 'course/big_mobile_image%s.png' % slug
+            decode_base64(image, path)
+            kwargs['big_mobile_image'] = path
 
         if level:
             kwargs['level'] = get_real_name(COURSE_LEVEL, level)