web_app displays vanilla twitter search
Merge branch 'master' into dev

Conflicts:
	web_app/disambiguator.py