made add troop available to admins
fixed event categories
fixed merge conflicts