Added in migration code to convert old XBMC settings to new KODI settings.
Bumped config to version 6 for config migration.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	sickbeard/config.py