Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings
Merge branch 'openelec-settings' of github.com:OpenELEC/OpenELEC.tv into openelec-settings
xbmc-addon-settings: update to xbmc-addon-settings-0.0.21

Signed-off-by: Stephan Raue <stephan@openelec.tv>