Fixes 302
Merge branch 'dev-candy' of https://github.com/buddycloud/webclient into dev-candy