Merge branch 'refs/heads/develop' into nosql

Conflicts:
	couchpotato/core/media/__init__.py
	couchpotato/core/notifications/trakt/main.py

couchpotato/core/settings.py

@@ -215,6 +215,7 @@ class Settings(object):
 
         # After save (for re-interval etc)
         fireEvent('setting.save.%s.%s.after' % (section, option), single = True)
+        fireEvent('setting.save.%s.*.after' % section, single = True)
 
         return {
             'success': True,