modified:   gui/datamanager.py
	modified:   gui/loopspanel.py
	modified:   lib/classes.py
	modified:   lib/datacube.py
	deleted:    lib/smartloop.old.py
	deleted:    matplotlib_test.py
	deleted:    scripts/__init__.py
	deleted:    scripts/acqiris_client_test.py
	deleted:    scripts/acqiris_library_test.py
	deleted:    scripts/acqiris_test.py
	deleted:    scripts/calibrate_test.py
	deleted:    scripts/codeeditor_example.py
	deleted:    scripts/creole.py
	deleted:    scripts/creole2html.py
	deleted:    scripts/datacube_test.py
	deleted:    scripts/datacubes.sqlite
	deleted:    scripts/datacubes2.sqlite
	deleted:    scripts/datamanager_test.py
	deleted:    scripts/dataviewer_test.py
	deleted:    scripts/dirmodel_test.py
	deleted:    scripts/elixir_test.py
	deleted:    scripts/examples/test.sql
	deleted:    scripts/examples/test.sql-journal
	deleted:    scripts/examples/use_datamanager_standalone.py
	deleted:    scripts/instrument_copy_test.py
	deleted:    scripts/latex.py
	deleted:    scripts/loop_test.py
	deleted:    scripts/measurementtool_test.py
	deleted:    scripts/movies.sqlite
	deleted:    scripts/multipart.py
	deleted:    scripts/multiprocessing_example.py
	deleted:    scripts/nodes.py
	deleted:    scripts/painting_test.py
	deleted:    scripts/panel_test.py
deleted:    scripts/processing_client_test.py
	deleted:    scripts/processing_test.py
	deleted:    scripts/pyside_module_test.py
	deleted:    scripts/pyside_reload_test.py
	deleted:    scripts/ramps_test.py
	deleted:    scripts/reload_test.py
	deleted:    scripts/remote_dispatcher_test.py
	deleted:    scripts/rest_test.py
	deleted:    scripts/scintilla_test.py
	deleted:    scripts/script_test.py
	deleted:    scripts/server_test.py
	deleted:    scripts/socket_server_test.py
	deleted:    scripts/spectro_test.py
	deleted:    scripts/sqlobject_tset.py
	deleted:    scripts/sweep_test.py
	deleted:    scripts/test_datacube.py
	deleted:    scripts/test_memory_leakage.py
	deleted:    scripts/test_mp_code_runner.py
	deleted:    scripts/test_remote_instrument_server.py
	deleted:    scripts/webkit_test.py
	deleted:    scripts/xml_test.py
	deleted:    scripts/xmlrpc_client_test.py
	deleted:    scripts/xmlrpc_server_test.py
	deleted:    scripts/xyplot.py
	deleted:    scripts/yoko_test.py
	deleted:    test/__init__.py
	deleted:    test/lib/__init__.py
	deleted:    test/lib/test_datacube.py
	deleted:    testproject.prj
Merge branch 'master' of https://github.com/manipp4/pyview