Wrong branch in master
Merge branch 'refs/heads/develop'

Conflicts:
	couchpotato/core/_base/updater/main.py
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'

Conflicts:
	version.py
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'

Conflicts:
	version.py
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'