Making stuff mergable

Merged these pending PRs:
https://github.com/joomla-projects/joomla-cms/pull/62 nternetinspired:toolbar-cleanup
https://github.com/joomla-projects/joomla-cms/pull/70 phproberto:jux-stools
https://github.com/joomla-projects/joomla-cms/pull/72 beat:jux

And merged latest changes of main master.

So should be mergable with joomla/joomla-cms/master now.