fixed search in merge
Merge branch 'master' of https://github.com/linked/django-easy-button

Conflicts:
	easy/views/easy_views.py