changed NULL to nullptr
removed foreach macro's
changes
scale part of builder
Updated OSX compiler settings
Merge remote-tracking branch 'gaganjyot/master'
Fixed crash on circle with negative scale factors