Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings
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
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings
connman: update default settings file

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge remote-tracking branch 'upstream/master' into openelec-settings
xbmc: add patch to allow plugins to set GUI language
openssh: rework init script

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'openelec-settings' of github.com:OpenELEC/OpenELEC.tv into openelec-settings
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings
xbmc-addon-settings: update to xbmc-addon-settings-0.0.8

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge remote-tracking branch 'upstream/master' into openelec-settings
Merge remote-tracking branch 'upstream/master' into openelec-settings
busybox: crond & crontab symlinks still have to be removed

    the new settings addon checks for /sbin/crond existence
    to decide whether cron support is there or not, so symlinks
    have to be removed
busybox: rework cron support
Merge remote-tracking branch 'upstream/master' into openelec-settings

Conflicts:
	packages/sysutils/busybox/install
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings

Conflicts:
	packages/linux-drivers/bcm_sta/install
	packages/sysutils/busybox/install
Revert "Revert "bluez: update to bluez-5.1""

This reverts commit b612271f7f659780d6dcbf70a2a2abd4da9ae606.
Revert "Revert "bluez: add init script and udev rule (needs rework)""

This reverts commit bd1fe46897408d4722df18a23429245aef031e2c.