LocationForm is its its Beta stages still not 100%
Merge branch 'master' of https://github.com/cjsolomon/Mulit-Modal

Conflicts:
	MMRP/src/GUI/SegmentTable.java
	MMRP/src/core/Segment.java