Searching now searches by title and post text OR by user OR by category
Search results now gives a message if it couldn't find anything, and also repeats what you searched for
Merge remote-tracking branch 'origin/master'