Add missing models
Merge pull request #156 from nickatbuddy/na_models

Models
Merge pull request #159 from BuddyPlatform/master

Merge master into develop