let there be SEARCH!
Merge branch '2.0' of github.com:DataViva/dataviva-site into 2.0

Conflicts:
	dataviva/general/views.py