Final Commit of changes for userbadges