Merge branch 'Developing'
Merge branch 'Developing'
Merge branch 'master' of https://github.com/pieterdewachter/Bartender