Merge branch 'refs/heads/techmunk-develop' into develop
Merge branch 'develop' of git://github.com/cptjhmiller/CouchPotatoServer into cptjhmiller-develop
fix ident in bithdtv
Cleanup KAT import
Merge branch 'refs/heads/cptjhmiller-develop' into develop
Move proxy getter to global torrent provider
Added XBMC collection (set) categorization capability.
Changed to using getattr() so films lacking sets/collections are also handled.
Don't try to unicode None object
Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop
bithdtv, Import correct functions
Merge branch 'develop_clean_path' of git://github.com/mano3m/CouchPotatoServer into mano3m-develop_clean_path
Merge branch 'refs/heads/mano3m-develop_clean_path' into develop
SP function wrapping whole variables
Merge branch 'refs/heads/develop'
Merge branch 'develop_scan_basefolder' of git://github.com/mano3m/CouchPotatoServer into mano3m-develop_scan_basefolder

Conflicts:
	couchpotato/core/plugins/renamer/main.py
Manual scan folder cleanup
Merge branch 'refs/heads/mano3m-develop_scan_basefolder' into manual_scan
Use correct config name for bithdtv
Merge branch 'refs/heads/develop'