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

Conflicts:
	The Seekers Way 0.2/Kiba.cpp