Merge branch 'develop'

SickBeard.py

gui/slick/images/subtitles/flags/alb.png

gui/slick/images/subtitles/flags/chi.png

gui/slick/images/subtitles/flags/cze.png

gui/slick/images/subtitles/flags/dum.png

gui/slick/images/subtitles/flags/dut.png

gui/slick/images/subtitles/flags/fre.png

gui/slick/images/subtitles/flags/frm.png

gui/slick/images/subtitles/flags/fro.png

gui/slick/images/subtitles/flags/ger.png

gui/slick/images/subtitles/flags/gsw.png

gui/slick/images/subtitles/flags/ice.png

gui/slick/images/subtitles/flags/mac.png

gui/slick/images/subtitles/flags/pob.png

gui/slick/images/subtitles/flags/rum.png

gui/slick/interfaces/default/inc_addShowOptions.tmpl

gui/slick/interfaces/default/inc_qualityChooser.tmpl

gui/slick/js/addShowOptions.js

lib/trakt/trakt.py

sickbeard/__init__.py