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.1-DEV: updated EditWdg to handle inline configs and to be able to set a display layout
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1
Merge branch 'master' of https://github.com/Southpaw-TACTIC/TACTIC
Merge branch '4.1'
BRANCH 4.1: more fixes to the edit widget
BRANCH 4.1: minor fixes to file browser (added some classes)
BRANCH 4.2: deleted old docs
BRANCH 4.2: added new files
BRANCH 4.1-DEV: Minor modifications to layout
BRANCH 4.1: fixed bug where testing a custom layout will have an unseriazable sobject (plugin) contained in it
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC
BRANCH 4.1-DEV: fixed hard coded <br> to <br/>
BRANCH 4.1-DEV: increased depth setting to 2 for check-in widget
Merge branch '4.1' of https://github.com/southpawtech/TACTIC-DEV into 4.1
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1