Init model from Server
Merge conflicts
working on restful stuff
Merge remote-tracking branch 'origin/master'
working on restful stuff