resolved conflict in nextgen provider

gui/slick/images/network/canal d.png

gui/slick/images/network/tv5 monde.png

gui/slick/images/network/tv5.png

gui/slick/images/network/w network.png

gui/slick/views/config_providers.mako

gui/slick/views/displayShow.mako

lib/tvdb_api/tvdb_api.py

sickbeard/__init__.py

sickbeard/clients/generic.py

sickbeard/helpers.py

sickbeard/logger.py

sickbeard/postProcessor.py

sickbeard/processTV.py

sickbeard/providers/bitcannon.py

sickbeard/providers/btdigg.py

sickbeard/providers/extratorrent.py

sickbeard/providers/generic.py

sickbeard/providers/hdtorrents.py

sickbeard/providers/kat.py

sickbeard/providers/nextgen.py