add emotions
Merge remote-tracking branch 'origin/test-ymm' into test-ymm

Conflicts:
	MWorld/res/layout/activity_dialog.xml
	MWorld/res/values/strings.xml