cc-2882: Airtime cannot delete watched folder when is been renamed

- initial commit

Conflicts:

	airtime_mvc/application/models/MusicDir.php

python_apps/media-monitor/MediaMonitor.py

@@ -59,7 +59,7 @@ try:
 
     wm = WatchManager()
     mmc = MediaMonitorCommon(config)
-    pe = AirtimeProcessEvent(queue=multi_queue, airtime_config=config, wm=wm, mmc=mmc)
+    pe = AirtimeProcessEvent(queue=multi_queue, airtime_config=config, wm=wm, mmc=mmc, api_client=api_client)
 
     bootstrap = AirtimeMediaMonitorBootstrap(logger, pe, api_client, mmc)
     bootstrap.scan()
@@ -89,4 +89,7 @@ except KeyboardInterrupt:
     notifier.stop()
     logger.info("Keyboard Interrupt")
 except Exception, e:
+    import traceback
+    top = traceback.format_exc()
     logger.error('Exception: %s', e)
+    logger.error("traceback: %s", top)