Fix issues with OS X 10.9 compilation, fix issues uncovered by clang
oops, I broke non-OSX build
fix scissoring during the DisplayRegion's glClear() operation
Added option to convert lights to locators
Merge remote-tracking branch 'upstream/master' into cmake