Merge branch 'release/7.x-0.5' into develop
The api for hook_ting_search_get_controls has changed
fix wrong condition
updated to version 7.x-0.6
Merge branch 'release/7.x-0.6'