Merge remote-tracking branch 'origin/uvcdat-87-bookmarked-file-gone' into uvcdat-master

* origin/uvcdat-87-bookmarked-file-gone:
  Bookmark and History list non-existant file bug fix
Merge remote-tracking branch 'origin/uvcdat-add-jorges-missing-features' into uvcdat-master

* origin/uvcdat-add-jorges-missing-features:
  Adds fix for transient variables
Merge remote-tracking branch 'origin/uvcdat-issue-68-undo-button' into uvcdat-master

* origin/uvcdat-issue-68-undo-button:
  Fix NoVistrail bug on clearing cell
  Use annotations to track undo/redo versions
  Ignore *.DS_Store files
  Fixes bugs with undo/redo icons
  Adding undo and redo icons
  Clear cell widgets in load_pipeline_in_location
  IMplement stub functions
  <Bugfix> UVCDAT Issue 68 undo redo work in progress </Bugfix>
Remove Spurious diagnostic print statements
Merge branch 'uvcdat-master' into uvcdat-better-pipeline-layout

Conflicts:
	vistrails/gui/uvcdat/project_controller.py
Merge branch 'uvcdat-better-pipeline-layout' into uvcdat-master
Merge branch 'uvcdat-153-loading-all-time' into uvcdat-master
Add read/write of trajectory paths
Ok got 1.3.0 to show
Refactor
Fix curtain creation bug
Merge remote-tracking branch 'origin/uvcdat-1.3-logo' into uvcdat-master

* origin/uvcdat-1.3-logo:
  Ok got 1.3.0 to show
Add more tests.
Remove Spurious diagnostic print statements
Add fix for detached pencil menu crash
Merge branch 'uvcdat-dv3d-add-catalog-browser' of vistrails.org:vistrails into uvcdat-dv3d-add-catalog-browser
Merge branch 'uvcdat-dv3d-add-catalog-browser' into uvcdat-master
Finish refactor
Fix bugs
Merge remote-tracking branch 'origin/uvcdat-dv3d-issue_159_edit_window_related_crashes' into uvcdat-master

* origin/uvcdat-dv3d-issue_159_edit_window_related_crashes:
  Fix bugs