update
Merge branch 'starry' of https://github.com/ohnova/TextActionFX into starry

Conflicts:
	app.html