Merge remote-tracking branch 'origin/master'

Conflicts:
	Robotopia/Classes/ResourceManager.cpp

kk