testing xbmc branch
Merge branch 'xbmc' of https://github.com/matthuisman/lemaker_android into xbmc