Merge branch 'develop'

gui/slick/images/network/american heroes channel.png

gui/slick/images/network/bravo (us).png

gui/slick/images/network/channel 5.png

gui/slick/images/network/chiba tv.png

gui/slick/images/network/military channel.png

gui/slick/images/network/spike.png

gui/slick/images/network/sun-tv.png

gui/slick/images/network/syndication.png

gui/slick/images/network/teletama.png

gui/slick/images/network/uktv yesterday.png

gui/slick/images/network/we tv.png

gui/slick/interfaces/default/apiBuilder.tmpl

sickbeard/databases/mainDB.py

sickbeard/helpers.py

sickbeard/providers/__init__.py

sickbeard/providers/cpasbien.py

sickbeard/providers/generic.py

sickbeard/providers/newznab.py

sickbeard/tv.py

sickbeard/webapi.py