Revert previous escape hack, as they addressed this with 12.1 update.
Merge pull request #637 from thezoggy/dev--xbmc12.1_update

Revert previous escape hack, as they addressed this with 12.1 update.
Add some logging to each 1080p migration part so people see some sort of progress in their console
Use show_id instead of tvdb_id for first part of migration, just in case there is a duplicate id or if show is missing tvdbid (never know)
Optimize query by reducing the arithmetic performed each time and queuing the list of updates to perform using a transaction (thanks @Prinz23)
Tweaked mass_action function so that we can log the individual queries if we wanted, by default we only log the amount of queries when completed. Should help with low powered devices when trying to do the work and log the work would cause some thrashing on the hdd.
Merge pull request #639 from thezoggy/dev--migration_tweaks

1080p migration tweak
Merge remote-tracking branch 'remotes/upstream/master' into torrentProviders
Merge remote-tracking branch 'upstream/torrentProviders' into torrentProviders

Conflicts:
	sickbeard/notifiers/xbmc.py