Merge branch 'master'

Conflicts:
	apps/harnessTest/MyWindow.cpp
	dart/dynamics/BoxShape.h
	dart/dynamics/EllipsoidShape.h
	dart/simulation/World.cpp
	dart/utils/FileInfoWorld.cpp