Fix: Perform the check if a folder should be skipped at the right location
Use correct option name in config file
Merge branch 'master' into skipfolders
Merge branch 'master' into skipfolders
- Check for output truncation in strcatf().
- SQL escape user input in TiVo command processing.
Merge branch 'master' into skipfolders

Conflicts:
	minidlnatypes.h
	upnpglobalvars.c
	upnpglobalvars.h
Merge branch 'master' into vfolders
Merge branch 'skipfolders' into vfolders

Conflicts:
	upnpglobalvars.c
	upnpglobalvars.h
Update gitignore