Chat app
Merge branch 'master' into storyProgress

Conflicts:
	game/Story/Artist/artist.rpy