eclipse is ok
ok
ok
ok
Merge origin/master

Conflicts:
	PolicyEar/pom.xml
ok
genel düzenleme
xcvbc
ddd
 vfb
Merge branch 'master' of http://192.168.100.73:8888/scm/git/Policy

Conflicts:
	PolicyAdminWeb/src/main/java/com/ergo/insyst/policy/bean/language/i18n.properties
	PolicyAdminWeb/src/main/webapp/WEB-INF/web.xml
genel düzenleme
genel düzenleme
Property save  is OK
Property save  is OK