Add ability to customize search filter place holder (fixes #221)
Fix flatpages targets setting behaviour, like titles (fixes #216)
Merge branch '216_fix_fp_targets' into develop

Conflicts:
	CHANGES.rst
Merge branch '221_search_placeholder' into develop