Run a normal search in case some assets don't have a category
Merge remote-tracking branch 'origin/bootstrap' into dev
Merge pull request #3 from entermedia-community/dev

merging bootstrap into Dev