SourceDownloadController
Merge branch 'olkooo' of github.com:Andronavt/lv-098_JAVA into bohdan
Create SourceUpdate jsp
Merge branch 'olkooo' of github.com:Andronavt/lv-098_JAVA into bohdan
Controller and Services for Download Sources
Stash Commit
Change
New version with strategy and downloader
change log4j configuration
Merge branch 'olkooo' of github.com:Andronavt/lv-098_JAVA into bohdan
repair after pull from olkooo
Add Exception Hierarchy
New datbase
change
Connection between DAO and Services
Handling Exceptions in Downloader
Version from bohdan
Changes in DB
Merge branch 'olkooo' of github.com:Andronavt/lv-098_JAVA into atrefyak

Conflicts:
	src/main/java/tc/lv/dao/BlackListDao.java
	src/main/java/tc/lv/dao/BlackListDaoImpl.java
	src/main/java/tc/lv/dao/SourceDao.java
	src/main/java/tc/lv/dao/SourceDaoImpl.java
	src/main/java/tc/lv/dao/UserDao.java
	src/main/java/tc/lv/dao/UserDaoImpl.java
	src/main/java/tc/lv/dao/WhiteListDao.java
	src/main/java/tc/lv/dao/WhiteListDaoImpl.java
	src/main/java/tc/lv/domain/IpAddress.java
	src/main/java/tc/lv/domain/IpV4Address.java
	src/main/java/tc/lv/domain/IpV6Address.java
	src/main/java/tc/lv/domain/NotValidIp.java
	src/main/java/tc/lv/domain/Role.java
	src/main/java/tc/lv/domain/Source.java
	src/main/java/tc/lv/domain/UserEntity.java
	src/main/java/tc/lv/service/SourceDownloaderService.java
	src/main/java/tc/lv/service/SourceDownloaderServiceImpl.java
	src/main/java/tc/lv/service/SourceServiceImpl.java
	src/main/java/tc/lv/service/UserDetailsServiceImpl.java
	src/main/java/tc/lv/service/WhiteListService.java
	src/main/java/tc/lv/service/WhiteListServiceImpl.java
	src/main/java/tc/lv/utils/AdaptorOpenBSD.java
	src/main/java/tc/lv/utils/Downloader.java
	src/main/java/tc/lv/utils/ParseStrategy.java
	src/main/java/tc/lv/utils/ParserChaosreignsWL.java
	src/main/java/tc/lv/utils/ParserUceprotect.java
	src/main/java/tc/lv/utils/Test.java
	src/main/java/tc/lv/web/SourceDownloadController.java
	src/main/java/tc/lv/web/WhiteListController.java
	src/main/resources/META-INF/persistence.xml
	src/main/resources/log4j.xml
	src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
	src/main/webapp/WEB-INF/spring/root-context.xml
	src/main/webapp/WEB-INF/views/admin/AddIpv4.jsp
	src/main/webapp/WEB-INF/views/admin/AddNewFeed.jsp
	src/main/webapp/WEB-INF/views/admin/listOfSource.jsp
	src/main/webapp/WEB-INF/views/head.jsp
	src/main/webapp/WEB-INF/views/index.jsp
	src/main/webapp/WEB-INF/views/menu.jsp
	src/main/webapp/WEB-INF/views/secure/GetIp4List.jsp
	src/main/webapp/WEB-INF/views/secure/listIpv4.jsp
	src/main/webapp/WEB-INF/views/user/registration.jsp
	src/main/webapp/WEB-INF/views/user/signin.jsp
	src/main/webapp/WEB-INF/views/user/signin_failure.jsp
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/resources/css/index.css