split the calculations in some functions
Merge branch 'master' of github.com:fuchsmich/velopt

Conflicts:
	main-v2.tng
asd