dialog v1
Merge remote-tracking branch 'origin/master' into Peter

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp
dialog
Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/Peter'
Merge remote-tracking branch 'origin/Peter'
Merge branch 'master' into Ameroz