Merge pull request #112 from BuddyPlatform/develop

Develop => Master for 2.0.7
Merge pull request #113 from BuddyPlatform/master

Merge pull request #112 from BuddyPlatform/develop