data tool unified dialog for EditObjectsManually + bugfix in outlines
Edits to help
Edits/corrections to help

Edits/corrections to help
More edits

More edits
Clarifications to help.

Clarifications to help.
Attempt to include wx.lib.filebrowsebutton in the Mac dmg
Merge branch 'master' of github.com:CellProfiler/CellProfiler
Clarifications to help

Clarifications to help
Clarifications to help.

Clarifications to help.
Edits to help re: masking

Edits to help re: masking
SaveImages "Create Subdirectories" visibility

The "Create Subdirectories" option in SaveImages is only valid when the
saved file name is based on one of the loaded images. I made it only
become visible when the method for constructing file names is set to
"From image filename".
Merge pull request #382 from BioTurboNick/upstream

SaveImages "Create Subdirectories" visibility
issue #387 - in get_unedited_segmented, return objects.segmented, not objects.__segmented to allow ijv conversion
Merge branch 'master' of github.com:CellProfiler/CellProfiler
StraightenWorms will calculate control points for objects not directly derived from UntangleWorms + tests
StraightenWorms needed some testing mods
Only draw in paint callback, keep Matplotlib blit from repainting screen by tricking it into thinking the window is hidden
Clarifications to help.

Clarifications to help
Use Cython 0.17 dotkit
Merge branch 'master' of github.com:CellProfiler/CellProfiler