we
qw
Merge branch 'master' of http://192.168.100.73:8888/scm/git/Policy
dsf
Merge branch 'master' of http://192.168.100.73:8888/scm/git/Policy
l
ok
ss
Merge branch 'master' of http://192.168.100.73:8888/scm/git/Policy

Conflicts:
	PolicyUtil/pom.xml
w
i18n is ok
dsdsdsd
Merge branch 'master' of http://192.168.100.73:8888/scm/git/Policy
i18n is ok
property browser lookup is ok
Merge origin/master

Conflicts:
	PolicyAdminWeb/src/main/java/com/ergo/insyst/policy/bean/i18n/text.properties
	PolicyAdminWeb/src/main/webapp/insession/property/propertyBrowser.xhtml
Merge origin/master

Conflicts:
	PolicyAdminWeb/src/main/java/com/ergo/insyst/policy/bean/i18n/text.properties
	PolicyAdminWeb/src/main/webapp/insession/property/propertyBrowser.xhtml