pull to r99
Merge embr r99 into devtest
We may have bugs in this merge in search.php

Conflicts:
	lib/twitteroauth.php
	search.php