talk feature finish
ori hotfix finished
Merge branch 'hotfix/ori_hotfix' into develop

Conflicts:
	talk.txt