Merge pull request #145 from BuddyPlatform/develop

Master => develop for 3.0.0 release cleanup
Merge pull request #151 from NewETown/develop

OCD Spacing and text edit
Merge pull request #150 from BuddyPlatform/develop

Develop => Master for 3.0.1
3.0.1 updates and a little cleanup in PushChat
3.0.2
Merge pull request #152 from BuddyPlatform/na_3.0.1_rel

Na 3.0.2 rel
Merge pull request #153 from BuddyPlatform/master

Master => Develop for 3.0.2 release cleanup