Display current search options
Merge branch 'master' of github.com:teampopong/polidic
Merge branch 'master' of github.com:teampopong/polidic

Conflicts:
	templates/party.html