Merge branch 'develop' into e-commerce-refactor

erpnext/www/lms/index.py

@@ -13,4 +13,4 @@ def get_context(context):
 
 
 def get_featured_programs():
-	return utils.get_portal_programs()
+	return utils.get_portal_programs() or []

erpnext/www/lms/program.py

@@ -26,4 +26,4 @@ def get_program(program_name):
 
 def get_course_progress(courses, program):
 	progress = {course.name: utils.get_course_progress(course, program) for course in courses}
-	return progress
+	return progress or {}