Added default values to acticve record models
Fixed some merge conflicts with backbone.rake