deactivated Toggle3DRendering for all non-4d shapes, as the volumerenderer can't deal with it
Merge branch 'master' of github.com:ilastik/ilastik
allowed 3DRendering only for 4d-shapes, which are the ones the VolumeRendering can handle
Merge branch 'master' of github.com:ilastik/ilastik
Merge branch 'master' of github.com:ilastik/ilastik
port to non-deprecated lazyflow API

unit tests pass
Merge pull request #241 from thorbenk/lazyflow_api_cleanup

port to non-deprecated lazyflow API
fix issue 97: use new OpMaxChannelIndicatorOperator
Merge branch 'master' of github.com:ilastik/ilastik
escape quotes in event recorder (bug 246)
Merge pull request #244 from buotex/6aa8c281e848b6929e0ee5f3471efccd14c63434

3DRendering Contextmenu
made lbp resp. skimage optional

Conflicts:
	ilastik/applets/objectExtraction/config.py
Merge pull request #247 from burgerdev/master

Quote escaping for Event Recorder