configfile modified
Merge branch 'freddiez'
JRE conflict
Merge branch 'master' of https://github.com/FaxOCRTeam/MVP.git

Conflicts:
	.classpath
	src/main/resources/ImageSegment.config
underline added into underline
Merge pull request #17 from FaxOCRTeam/freddiez

underline added into underline
local commit
Merge branch 'master' into xwz

Conflicts:
	.classpath