Minor refactoring
Codeformatting
Minor error
Codeformatting
Merge branch 'release/7.x-0.5+dbc.1' into develop
Merge branch 'feature/1207_full' into develop

Conflicts:
	search/ting_search.inc
Tagging version 7.x-0.5+dbc.2.
Merge branch 'release/7.x-0.5+dbc.2'