"Revert and Restore tools", "Manage the Composer" and add subsitution for un/locked icons.
Merge pull request #383 from diethard2/master

removed new items of 2.2 from whats new in 2.6
Merge pull request #380 from mewoch/items

"Revert and Restore tools", "Manage the Composer" and add substitution fo...
repaired a little mistake included in commit #380