working on text

not quite there yet...
Improved text component
Merge remote-tracking branch 'origin/master'

Conflicts:
	examples/dialogs.js