Merge branch 'develop'

.gitignore

SickBeard.py

gui/slick/js/addExistingShow.js

gui/slick/js/ajaxEpSearch.js

gui/slick/js/ajaxEpSubtitles.js

gui/slick/js/apibuilder.js

gui/slick/js/blackwhite.js

gui/slick/js/browser.js

gui/slick/js/configNotifications.js

gui/slick/js/configPostProcessing.js

gui/slick/js/configProviders.js

gui/slick/js/configSearch.js

gui/slick/js/configSubtitles.js

gui/slick/js/confirmations.js

gui/slick/js/displayShow.js

gui/slick/js/failedDownloads.js

gui/slick/js/manageEpisodeStatuses.js

gui/slick/js/manageSubtitleMissed.js

gui/slick/js/massUpdate.js

gui/slick/js/new/comingEpisodes.js