pre-alpha updates - added badgemaker and changes to profile and organization active swapping. Other clean-up included