dialog journal fix
dialogue size fix
Merge remote-tracking branch 'origin/master' into peter

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp