show correct season number in library title
Add support for disk space module to show IEC binary units OR metric units. Note that this change fixes prefixes to be correct everywhere format_number is used (ie. download speeds).
Couch Potato only requires the image filename in the file.cache request, not the whole path.
Merge branch 'master' into binary_storage_units
Reduced text size of cp quality overlays
Merge branch 'master' into binary_storage_units
Fixed couchpotato wanted list and movie thumbnails to work with Couchpotato Server v2.1
Merge pull request #308 from midgetspy/master

Fix broken couch potato images
Merge pull request #307 from midgetspy/binary_storage_units

Add support for binary and metric byte prefixes
Merge pull request #303 from N3MIS15/special_fix

show correct season number in library title
Update LICENSE
Fix the sizes of some of the text in the CP movie listing
Shows posters in their correct aspect ratio instead of showing them at a wider ratio and cutting off the bottom 66%.
Merge pull request #317 from midgetspy/recently_added_posters

Shows posters in their correct aspect ratio instead of cropping them
Merge pull request #316 from midgetspy/movie_description_size

Fix the sizes of some of the text in the CP movie listing
Fix a bug introduced with the recently added TV episode thumbnail sizes
Merge pull request #318 from midgetspy/recently_added_posters

Fix a bug introduced with the recently added TV episode thumbnail sizes
Fix CloudFlare 1010 error in TraktPlus module
Merge pull request #320 from taeram/fix-traktplus-cloudflare-1010-error

Fix CloudFlare 1010 error in TraktPlus module
Merge https://github.com/disengaged/maraschino

Conflicts:
	modules/couchpotato.py