Permutation test
Merge branch 'master' into PermutationTest

Conflicts:
	geometry/geometry.vcxproj.filters
Merge pull request #47 from pleroy/PermutationTest

Permutation test
Merge branch 'master' into small-renamings