Merge pull request #324 from buddycloud/dev-candy

Updates from dev-candy
Merge branch 'master' of https://github.com/buddycloud/webclient into dev-candy
Debug flag