Merge and commit Campus Map search and category show/hide
Merge remote-tracking branch 'origin/master'