Fix exception when pressing enter before typing text in the filter
Merge branch 'master' into unibe-master

Conflicts:
	templates/jquery.livesearch.js