Updated phpThumb to its current GitHub status, (which seems to be 1.7.12-pre).
Translated few sentences
Translated few sentences
Updated PHPMailer to v5.2.8
Updated x
Bring back color to deleted resource icon
Updated lines in russian lexicon files
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
Increased size of user photo to look sharper on retina devices
Restores highlighting Resource being edited, corrected actionable hex color
Restores highlighting Resource being edited, corrected actionable hex color

* origin/pr/11549:
  Restores highlighting Resource being edited, corrected actionable hex color
Increased size of user photo to look sharper on retina devices

* origin/pr/11548:
  Increased size of user photo to look sharper on retina devices
Updated lines in russian lexicon files

* origin/pr/11543:
  Updated lines in russian lexicon files
Translated few sentences to Polish

* origin/pr/11493:
  Translated few sentences
Translated few sentences to Polish

* origin/pr/11492:
  Translated few sentences