recommiting fixes
Merge branch 'mumble' of https://github.com/heinzK1X/genesis into mumble
Merge branch 'master' into mumble
readding logo and main xml
Merge branch 'master' into mumble
add link dialogbox somewhat nicer now
Improved channels tab
first running version of the etherpad webapp
bump wallabag
samba settings now correctly applied to individual shares, closes #46
Merge pull request #327 from heinzK1X/mumble

Mumble
allow setting of MAC address and SD resize for cb2/cb3
0.5.4
Merge remote-tracking branch 'upstream/master' into etherpad
fix ghost bug
Merge remote-tracking branch 'upstream/master' into etherpad
First start prompt + peanuts
adding supervisor
adding preinstalled plugin support