Added options for sorting search results
Merge branch 'master' of github.com:Mouseketeers/search

Conflicts:
	code/SearchPage.php