osx buildcheck done
Merge branch 'refs/heads/release' into vs2012

Conflicts:
	examples/example-emptyScene/example-emptyScene.sln
	examples/example-emptyScene/example-emptyScene.vcxproj
	examples/example-emptyScene/example-emptyScene.vcxproj.filters