Salesforcefield update
Merge branch 'master' of https://github.com/ChrismCruz/Cruz

Conflicts:
	Functions/time_functions.pyc
	Scripts/CronRun/__init__.pyc
	Scripts/CronRun/cron_script_run.pyc
	Scripts/GspreadUpdate/GspreadFunctionUpdate/__init__.pyc
	Scripts/GspreadUpdate/GspreadFunctionUpdate/gspread_function_update.pyc
	Scripts/GspreadUpdate/__init__.pyc

Trying to merge