Toolbar buttons reorder
Add widget border to buddy window
Merge branch 'master' of https://github.com/roman-yagodin/PlaneShift.EnchantedElves

Merge local changes