Slicing
Merge branch 'master' of github.com:paweljw/engths2013

Conflicts:
	soft/CMakeLists.txt
	soft/src/flatmatrix.h
	soft/src/gpusolver.h
	soft/src/oclvector.h
	soft/src/shortmatrix.h
	soft/src/tests/mtx_loader.cpp
	soft/src/twokernels.cl
	soft/src/util.h