Merge remote-tracking branch 'origin/master' into peter
textboxloop fix
Merge remote-tracking branch 'origin/peter'
Merge remote-tracking branch 'origin/master' into peter
dialogue music
Merge remote-tracking branch 'origin/peter'
merge
Merge remote-tracking branch 'origin/master' into peter

Conflicts:
	The Seekers Way 0.2/Dialoger/Level5StartDialogue.xml
	The Seekers Way 0.2/musik lista.txt
Merge remote-tracking branch 'origin/peter'