Clean Code
Merge branch 'master' of https://github.com/kmarshman/EcoRe

Conflicts:
	EcoRe/src/rcm/MaintenanceUI.java
TEst
Test