1
m
Merge branch 'master' of github.com:AbrosimovPavel/test

Conflicts:
	web/WEB-INF/spring/security.xml
1
1
Merge branch 'master' of github.com:AbrosimovPavel/test

Conflicts:
	src/com/epam/training/model/domain/database/connection/DBConnectionPool.java
	src/com/epam/training/model/domain/database/datahandler/UserDataHandler.java
1