Updated phpThumb to its current GitHub status, (which seems to be 1.7.12-pre).
Updated PHPMailer to v5.2.8
Updated x
Bring back color to deleted resource icon
Translated new and changed phrases to German
Updated phpThumb to its current GitHub status, (which seems to be 1.7.12-pre).

* origin/pr/11195:
  Updated phpThumb to its current GitHub status, (which seems to be 1.7.12-pre).
Updated PHPMailer to v5.2.8

* origin/pr/11513:
  Updated PHPMailer to v5.2.8
Updated tree colors and made a start with beter color variables

* origin/pr/11542:
  Updated x

Conflicts:
	manager/templates/default/css/index.css
Bring back color to deleted resource icon

* origin/pr/11546:
  Bring back color to deleted resource icon
Translated new and changed phrases to German

* origin/pr/11547:
  Translated new and changed phrases to German
Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop