sort / search
Merge branch 'master' of github.com:natebeacham/django-voice

Conflicts:
	djangovoice/static/djangovoice/css/style.css
	djangovoice/static/djangovoice/css/style.sass