Merge branch 'origin/master'

Conflicts:
	apps/harnessTest/MyWindow.cpp
	dart/simulation/World.cpp