SP-1027:
- Updated watch folder script based on errors encountered with Viacom
BRANCH:SP-1150: Added the following options to the message_wdg.py [icon,show_preview,show_message_history,show_timestamp] that can be customized from the UI
BRANCH:SP-1150: modified code as per code review suggestions
BRANCH:SP-1150: checked for boolean False
Merge pull request #59 from Southpaw-TACTIC/SP-1150

BRANCH:SP-1150: Added the following options to the message_wdg.py [icon,...
BRANCH timezone_update:
   add local server timezone to time before saving to prevent treating it as GMT initially.
Merge pull request #74 from Southpaw-TACTIC/oboreo/timezone_update

BRANCH timezone_update:
BRANCH timezone_update:
   fixed a bug in SPTDate.has_timezone
   added the timezone %Z in the string conversion of time/date object during commit to fix a bug in update_data not having timezone value
Merge pull request #76 from Southpaw-TACTIC/oboreo/timezone_update

BRANCH timezone_update:
Merge pull request #53 from Southpaw-TACTIC/SP-1027

SP-1027:
Merge branch '4.3' into 4.2

Conflicts:
	src/pyasm/command/edit_wdg_action.py
	src/pyasm/common/spt_date.py
Merge branch '4.2' into 4.3