updates
updates
Filter Category Function
Merge remote-tracking branch 'origin/neil_9162014_0' into ian-9-10-14