FeatureSet.php #2

# Change User Description Committed
#2 18730 Liz Lam clean up code and move things around
#1 18334 Liz Lam initial add of jambox