Merge pull request #364 from ProfYaffle/master

Addition of user options for file and directory permissions

diff --cc src/dvr/dvr.h
Simple merge

diff --cc src/dvr/dvr_db.c
Simple merge

diff --cc src/utils.c
Simple merge

diff --cc src/webui/extjs.c
Simple merge