Bringing in updates from upstream

Hi

these are the changes since the ilanguage fork was last updated, they are mostly for the html5 components, but its still best to be up to date. The BAT is running on a version of OPrime from over a year ago, so I will send you instructions in the other issue...