Merge branch 'master' of github.com:ustasb/dunkin_donuts_auto_survey into server