Merge branch 'master', remote-tracking branch 'origin'
issue #704 fixed. ImageJ 1.x compatibility restored.
Merge branch 'master' of github.com:CellProfiler/CellProfiler
Merge branch 'master' into imagej1

Conflicts:
	cellprofiler/modules/tests/test_run_imagej.py