Merge branch 'develop' into tv_sync

Conflicts:
	couchpotato/core/media/__init__.py
	couchpotato/core/media/_base/searcher/main.py
	couchpotato/core/media/movie/_base/main.py
	couchpotato/core/media/movie/library/movie/main.py
	couchpotato/core/plugins/release/main.py
	couchpotato/core/providers/info/_modifier/__init__.py
	couchpotato/core/providers/nzb/newznab/main.py
	couchpotato/core/providers/torrent/bithdtv/main.py
	couchpotato/core/providers/torrent/iptorrents/main.py
	couchpotato/core/providers/torrent/sceneaccess/main.py
	couchpotato/core/providers/torrent/thepiratebay/main.py
	couchpotato/core/providers/torrent/torrentday/main.py
	couchpotato/core/providers/torrent/torrentshack/main.py
	couchpotato/core/providers/torrent/yify/main.py
	couchpotato/core/settings/model.py