revising scouts_badges table
Merge branch 'master' of github.com:abmcdubb/troop_hub
fixed merge conflicts