fixes #106
Merge branch 'master' of git://github.com/SSilence/selfoss.git

Conflicts:
	daos/mysql/Items.php
merge upstream
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixes broken search string deletion #242
Merge pull request #256 from ochristi/master

fix for #242