ding2 -> ding2tal
tag -> branch
Updated search result to use display mode settings
Reverted changes to the make file
Fixed merge conflict in make file
Removed un-used display/view mode
Revert "Updated search result to use display mode settings"

This reverts commit 85894f21b3b90f37adc0a809bd18c1e206904f59.
Updates search result pane to use ting_search_result theme function
Merge branch 'use_theme_function_for_search' into development
Removed stylesheet, nothing relevant in there and we should let the theme take care of styling
Change menu alter text strings into english from danish
Fixed slash delimiter in search string, which failes inside regex quote function
Merge remote-tracking branch 'ding2tal/development' into ding2tal
Merge branch 'ding2tal' into case-2765

* ding2tal:
  Fixed slash delimiter in search string, which failes inside regex quote function
  Change menu alter text strings into english from danish
  Removed stylesheet, nothing relevant in there and we should let the theme take care of styling
  Updates search result pane to use ting_search_result theme function
  Revert "Updated search result to use display mode settings"
  Removed un-used display/view mode
  Reverted changes to the make file
  Updated search result to use display mode settings
  tag -> branch
  ding2 -> ding2tal

Conflicts:
	plugins/content_types/search_result.inc
Merge branch 'case-2765' into develop

* case-2765:
  Fixed slash delimiter in search string, which failes inside regex quote function
  Change menu alter text strings into english from danish
  Removed stylesheet, nothing relevant in there and we should let the theme take care of styling
  Updates search result pane to use ting_search_result theme function
  Revert "Updated search result to use display mode settings"
  Removed un-used display/view mode
  Reverted changes to the make file
  Updated search result to use display mode settings
  tag -> branch
  ding2 -> ding2tal