Minor fixes
Merge branch 'master' of https://github.com/concord-consortium/energy3d.git
Merge branch 'master' of https://github.com/concord-consortium/energy3d.git
Merge branch 'master' of
https://github.com/concord-consortium/energy3d.git

Conflicts:
	src/main/java/org/concord/energy3d/MainApplication.java