fixed depreciated methods and properties
fixed underscore retain cycle warning with update from underscore repo
Resolve merge conflict