More Fixes to FeatureTabs
Merge remote-tracking branch 'github/develop' into feature/sbCompress

Conflicts:
	design/templates/featureTab.handlebars
Changed Pool-Data source name