Merge branch 'refs/heads/develop'
version.master
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'
Merge branch 'refs/heads/develop'
Files not properly send to sabnzbd
variable 'year' referenced before assignment
Merge branch 'refs/heads/develop'

Conflicts:
	couchpotato/core/helpers/variable.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'