Merge branch 'feature/add_stage6' of github.com:jonathanrocher/ets_tutorial into feature/add_stage6

Author: jonathanrocher

stage6_branded_application/pycasa/ui/tasks/pycasa_task.py

@@ -78,6 +78,7 @@ def scan_current_path(self):
             msg = "No active tab/path. You must open a path before you can " \
                   "scan it for faces"
             error(None, msg)
+            return
 
         active_editor = self.central_pane.active_editor
         model = active_editor.obj