Integration with sorceforge branch: maxEntityLength calculation (probably not needed after merge complete)

also allow for the ';' or not when looking up specialentity's - once again to help with integration.
Merge branch 'merge_sf'
updated version to 2.4:
Merged with SF-version
Merge branch 'master' into merge_sf