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

Conflicts:
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters