updated to db model
Merge branch 'master' of github.com:coolaj86/angular-project-template