Merge remote-tracking branch 'oc/special_char_escaping' into merge
Merge remote-tracking branch 'oc/adv-search' into merge
Merge remote-tracking branch 'oc/advanced' into merge

Conflicts:
	ting_search.module
because of merges of use-special-chars and adv-search