some more updates
Merge branch 'master' of github.com:lipsia-group/lipsia
cleanup via / viaio inludes
Merge pull request #7 from karda/master

cleanup via / viaio inludes
release/2.2.10
Newest permutation programs etc
Merge remote-tracking branch 'authority/master'

Conflicts:
	src/new/vnonparam_cluster/CMakeLists.txt
	src/new/vnonparam_cluster/vclusterhist.cpp
	src/old/vgendesign/vgendesign.c
fix slice timing of the first volume by clonig it from the second volume
Merge branch 'master' of github.com:lipsia-group/lipsia
Merge branch 'master' into slicetime_fix
Merge pull request #9 from lipsia-group/slicetime_fix

Slicetime fix
fix crash in vshowpts
release 2.2.11
Merge branch 'master' into debian
debian release 2.2.11-1