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

master into dev to correct accidental backwards merge from dev into bootstrap