bugs
Merge branch 'master' of raspbeerdroid
bugss