Revert "	modified:   Geometry.cpp"

This reverts commit 89a25e66b218854f8759bee2da4681474b8984ae.

Conflicts:
	source/Tag.h

	modified:   source/Geometry.cpp
	modified:   source/Geometry.h
	deleted:    source/Indicator.cpp
	deleted:    source/Indicator.h
	modified:   source/Tag.cpp
	modified:   source/Tag.h