Change log4j
commit after merging from bohdan2
commit after pull from olkooo
Merge branch 'olkooo' of github.com:Andronavt/lv-098_JAVA into bohdan

Conflicts:
	.gitignore
	src/main/java/tc/lv/dao/BlackListDao.java
	src/main/java/tc/lv/dao/BlackListDaoImpl.java
	src/main/java/tc/lv/dao/DownloaderDaoImpl.java
	src/main/java/tc/lv/dao/NotValidIpAddressDao.java
	src/main/java/tc/lv/dao/NotValidIpAddressDaoImpl.java
	src/main/java/tc/lv/dao/SourceDaoImpl.java
	src/main/java/tc/lv/dao/WhiteListDao.java
	src/main/java/tc/lv/dao/WhiteListDaoImpl.java
	src/main/java/tc/lv/utils/ParserChaosreignsWL.java
	src/main/java/tc/lv/utils/ParserOpenBSD.java
	src/main/java/tc/lv/utils/ParserUceprotect.java
	src/main/java/tc/lv/web/RegistrationController.java
	src/main/java/tc/lv/web/SigninController.java
	src/main/resources/log4j.xml
	src/main/webapp/WEB-INF/tiles.xml
	src/main/webapp/index.jsp
	src/main/webapp/resources/css/menu.css
	src/main/webapp/resources/js/ajax.js
	src/main/webapp/resources/js/content.js
	src/main/webapp/views/tiles/header.jsp
	src/main/webapp/views/tiles/menu.jsp
	src/main/webapp/views/user/registration.jsp
	src/main/webapp/views/user/signin.jsp
commit
Merge branch 'master' of github.com:Andronavt/lv-098_JAVA into bohdan

Conflicts:
	.gitignore
	src/main/java/tc/lv/dao/BlackListDao.java
	src/main/java/tc/lv/dao/BlackListDaoImpl.java
	src/main/java/tc/lv/dao/IpV4AddressDao.java
	src/main/java/tc/lv/dao/IpV4AddressDaoImpl.java
	src/main/java/tc/lv/dao/IpV6AddressDao.java
	src/main/java/tc/lv/dao/IpV6AddressDaoImpl.java
	src/main/java/tc/lv/dao/NotValidIpAddressDao.java
	src/main/java/tc/lv/dao/NotValidIpAddressDaoImpl.java
	src/main/java/tc/lv/dao/WhiteListDao.java
	src/main/java/tc/lv/dao/WhiteListDaoImpl.java
	src/main/java/tc/lv/service/SourceServiceImpl.java
	src/main/java/tc/lv/service/WhiteListServiceImpl.java
	src/main/java/tc/lv/web/RegistrationController.java
	src/main/java/tc/lv/web/SigninController.java
	src/main/java/tc/lv/web/SourceDownloadController.java
	src/main/webapp/WEB-INF/tiles.xml
	src/main/webapp/index.jsp
	src/main/webapp/resources/css/index.css
	src/main/webapp/resources/css/menu.css
	src/main/webapp/resources/js/ajax.js
	src/main/webapp/resources/js/content.js
	src/main/webapp/views/tiles/header.jsp
	src/main/webapp/views/tiles/menu.jsp
	src/main/webapp/views/user/registration.jsp
	src/main/webapp/views/user/signin.jsp
add validation to registration form, add validation to WhiteLIst
Controller? chenged WhiteList Controller and Service
Add Exceptions in all services and controllers. Add BlackLIstService and
Controller.
test
my changes