[html5] pull request 40 and 41 by limikael (Mikael Lindqvist).
Made TextFields with htmlText show a border
Resolved conflicts after merge with upstream

Merge remote-tracking branch 'upstream/master'

Conflicts:
	browser/text/Font.hx
	tools/smoke.jeash.com/text/BasicTextField.hx
	tools/smoke.jeash.com/text/hobbyofnight.readme.txt
	tools/smoke.jeash.com/text/makefile