0.9.6
Merge branch 'master' of https://github.com/teeedubb/teeedubb-xbmc-repo

Conflicts:
	script.steam.launcher/changelog.txt
	script.steam.launcher/default.py
	script.steam.launcher/resources/language/English/strings.xml
	script.steam.launcher/resources/scripts/SteamLauncher-AHK.ahk
	script.steam.launcher/resources/scripts/steam-launch.sh
	script.steam.launcher/resources/settings.xml