merged
merged
fix models/base.coffee
add user model methods
fix models