mayor restructuring to accomodate plug-in architecture
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/hlw5a/TinMan/UI/TMDetailProceedings.java