commit
Merge branch 'master' of https://github.com/maninsoft/smartworksV3.git

Conflicts:
	WebContent/jsp/layouts.jsp
	WebContent/resources/flash/SmartWorkbenchEditor.swf