xxx
Merge branch 'master' of https://github.com/janenie/InstantTalk

Conflicts:
	project/correct_version/dialog.pyc
done
done