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

Conflicts:
	The Seekers Way 0.2/The Seekers Way.vcxproj
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters
Merge remote-tracking branch 'origin/Peter'

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