Added new models and one service level class
Merge branch 'development' of github.com:TeamFit/web-app into development

Pulling latest from development before push