BRANCH 4.2: set version to 4.2.0.a01
BRANCH 4.2: initial prototype of wizard to create db resources
Merge branch 'master' into 4.2

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 'master' into 4.2

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
BRANCH 4.2: deleted old docs
BRANCH 4.2: added new files
BRANCH 4.1: fixed bug where testing a custom layout will have an unseriazable sobject (plugin) contained in it
BRANCH 4.1: added support for # on docs
BRANCH 4.2: added test link to github docs
Merge branch '4.1' into 4.2

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
	src/tactic/ui/tools/custom_layout_edit_wdg.py
Merge branch 'master' into 4.2
Merge branch '4.2' of https://github.com/Southpaw-TACTIC/TACTIC into 4.2
BRANCH 4.2: fixed bad version file
Merge branch '4.2' of https://github.com/Southpaw-TACTIC/TACTIC into 4.2
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
Merge pull request #3 from southpawtech/4.2

Cumulative updates on dev fork
BRANCH 4.1:
  updated Project Essentials > Notes to have a simple keywords search