Added Shelf Button Icon for Concierge
Improved unitttest handling
Additional node types per Will and David's list
Merge branch 'develop'