Search Update

Query change
Merge branch 'master' of https://github.com/sutt0n/spe

Conflicts:
Scheduling/Scheduling Code/code/search.php
Merge branch 'master' of https://github.com/sutt0n/spe