Merge pull request #153 from BuddyPlatform/master

Master => Develop for 3.0.2 release cleanup
Add missing models
Merge pull request #156 from nickatbuddy/na_models

Models