import
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/demos_song/text/HtmlText.java