Layer --- Segment --- Module
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebInterface/src/main/webapp/text.jsp