minor fixes
Merge branch 'master' of GitHub:jlamanna/encounter-extract

Conflicts:
	ui/EncounterExtractUI.py
	ui/encounterextract.fbp