Added missing + additional modules
Merge branch 'xbian-alpha5' of https://github.com/xbianonpi/xbian into xbian-alpha5