New query goodness
Merge branch 'master' into asset-term2
search by index terms method added to assets model
Updated search, now able to search by name and activity type
fixing conflict