Merged stable branch + modified auth mechanism
Updated canvabadges