add categories
add category preffered words and partial ignore.
Merge branch 'develop-categories' of git://github.com/clinton-hall/CouchPotatoServer into clinton-hall-develop-categories

Conflicts:
	couchpotato/core/plugins/score/main.py
Movie category migrate
Combine global and category words
Move providers to main searcher tab in settings
Add categories to settings
Proper meta tag
Check isMac function
Select category for search, suggest & edit
Merge remote-tracking branch 'upstream/develop'