Fix bug causing js models to be out of sync with database
Merge branch 'develop'
"Fix bug causing js model to be out of sync with database and include underscore utility methods"