Merge pull request #1111 from Karlson2k/UseJoystick

[input] Add 'Enable Joystick' to GUI settings. Fix for http://trac.xbmc.org/ticket/13146

diff --cc language/English/strings.po
Simple merge

diff --cc xbmc/Application.cpp
Simple merge

diff --cc xbmc/settings/GUISettings.cpp
Simple merge