Merge branch 'projects-task-53' into 'master'

Projects Task 53

Merge fix for null course generation breaking four-year-plan page rendering.

application/modules/fouryearplans/views/scripts/view/four-year-plan.phtml

@@ -58,6 +58,7 @@ $uniqueId = ++$this->layout()->uniqueId;
                             <?php
                             } else if ($course['course']) {
 								$planCourse = $this->planCourses[$course['course']];
+								if ($planCourse) {
 									?>
 									<tr class="change-<?php echo $course['change']; ?>">
 										<td>
@@ -68,7 +69,16 @@ $uniqueId = ++$this->layout()->uniqueId;
 										<td><?php echo $course['hours'] ? $course['hours'] . ' cr' : substr($planCourse->getCreditsText(), 1, strpos($planCourse->getCreditsText(), 'cr') + 1); ?></td>
 										<td><?php echo $planCourse->getTitle(); ?></td>
 									</tr>
-                            <?php }} ?>
+								<?php }
+								else {
+								?>
+									<tr class="change-<?php echo $course['change']; ?>">
+										<td>
+											Error loading current course information.
+										</td>
+										<td></td>
+									</tr>
+							<?php }}} ?>
                         </tbody>
                     </table>
                 </div>