BRANCH 4.1-DEV: added new note input widget
BRANCH 4.1-DEV: cleaned up the notes input widget a bit.
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1
BRANCH 4.1-DEV: fix small error when sobject is null
BRANCH 4.1:
  updated Project Essentials > Notes to have a simple keywords search
BRANCH 4.1:
   added a better message telling the user that the Ingest Files widget requires a name column for the sType
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1
BRANCH 4.1: added ability to select sandbox dirs
BRANCH 4.1: added support for setting alias repositories
BRANCH 4.1: added columns to update script
BRANCH 4.2-DEV: changed version to 4.2.0.a01
BRANCH 4.2: more on ability to select sandbox
BRANCH 4.2: more updates on expanding multiple sandboxes and repos
BRANCH 4.2: added better refresh on selection and added a new menu to
show sandbox selection
BRANCH 4.1:
  displayed the current user signing out in the log message when accessing the SignOutCmd in the Page Header area.
BRANCH 4.1:
  made Html5 Upload work in Hidden Row as well
  set up the context menu only when it's not running in temp mode.
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1

Conflicts:
	VERSION
	src/client/tactic_client_lib/VERSION
	src/client/tactic_client_lib/tactic.zip
	src/context/VERSION
	src/context/client/tactic.zip
	src/pyasm/application/common/interpreter/tactic_client_lib/VERSION
Merge branch '4.1' into 4.2

Conflicts:
	src/client/tactic_client_lib/tactic.zip
	src/context/client/tactic.zip
Merge branch '4.2' of https://github.com/Southpaw-TACTIC/TACTIC into 4.2
Merge branch 'master' of https://github.com/Southpaw-TACTIC/TACTIC