Fixing Display::getContentScale()
Merge pull request #417 from arielm/fix-retina-osx

Fixing Display::getContentScale()
Addressing leak in qtime::MovieWriter
Merge branch 'dev' of github.com:cinder/Cinder into dev
Merge remote-tracking branch 'upstream/dev' into dev-scons