Merge branch 'master' into lazycc
Merge branch 'lazycc' of github.com:burgerdev/ilastik into lazycc
Merge branch 'master' into lazycc

Conflicts:
	ilastik/workflows/__init__.py
Merge branch 'lazycc' of github.com:burgerdev/ilastik into lazycc