And even more modules
Merge branch 'xbian-beta1' of https://github.com/xbianonpi/xbian into xbian-beta1