After pleroy's phone review.
Merge branch 'remove-dimensionless' into fix-assignment

Conflicts:
	geometry/r3_element.hpp
	geometry/r3_element_body.hpp