?
Merge branch 'master' of github.com:ikolesov/kslice

Conflicts:
	src/kslice_wrap/setUpSlicerDebug.py
testing 2d actions