change log4j to logging in bin of JBoss
Merge branch 'dev' of github.com:Andronavt/lv-098_JAVA into dev

Conflicts:
	src/main/resources/META-INF/persistence.xml
	src/main/webapp/resources/js/jVectorMap/countryJsonBlackList.js
	src/main/webapp/resources/js/jVectorMap/countryJsonWhiteList.js
Merge branch 'dev' of github.com:Andronavt/lv-098_JAVA into dev

Conflicts:
	src/main/java/tc/lv/service/implementation/IpAddressServiceImpl.java
	src/main/resources/META-INF/persistence.xml
	src/main/webapp/resources/js/jVectorMap/countryJsonBlackList.js
	src/main/webapp/resources/js/jVectorMap/countryJsonWhiteList.js
Merge branch 'dev' of github.com:Andronavt/lv-098_JAVA into dev

Conflicts:
	src/main/java/tc/lv/service/implementation/IpAddressServiceImpl.java
	src/main/resources/META-INF/persistence.xml