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.1-DEV: Minor modifications to layout
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
BRANCH 4.1: handled bad & character in xml
BRANCH 4.1-DEV: added ability to switch layout of a ViewPanelWdg in javascript
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1
BRANCH 4.1-DEV: added provision for palette.color() to use #XXXXXX colors
Merge branch '4.1-DEV'

Conflicts:
	src/tactic/ui/panel/edit_wdg.py
Merge branch 'master' of https://github.com/Southpaw-TACTIC/TACTIC
Merge branch '4.2' of https://github.com/Southpaw-TACTIC/TACTIC into 4.2