Merge Buzz365 v1.0 Dev into Master