Merge commit 'origin/master' into yaml

lib/laditools/__init__.py

@@ -21,7 +21,7 @@ from jack_configure import jack_configure
 from ladimenu import manager, find_data_file
 from a2j_controller import a2j_controller
 from a2j_menu import a2j_menu
-from lash_controller import ladish_proxy
+from ladish_controller import ladish_proxy
 # from error import error
 from config import config
 from TreeViewTooltips import TreeViewTooltips