Minor refactoring
Codeformatting
Minor error
Codeformatting
Merge branch 'feature/1207_full' into develop

Conflicts:
	search/ting_search.inc