modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/CommandHelper.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/registration/Validation.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/registration/Validator.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleUserDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/Registration.jsp
	deleted:    Docs/Scripts/BoreasFillingScript.sql~
	renamed:    Docs/Scripts/fillwithDisconnect.txt -> Docs/Scripts/fillwithDisconnect.sql
	deleted:    Docs/Scripts/fillwithDisconnect.txt~
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/CommandHelper.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/iedashboard/CreateCable.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/iedashboard/DeleteCable.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/pedashboard/ModifyServiceInstance.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/connection/ConnectionPool.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/factory/AbstractFactoryDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/factory/implementations/OracleDAOFactory.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleCableDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleCircuitDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleDeviceDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OraclePortDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleUserDAO.java
	renamed:    InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/csedashboard/CSESITableDAO.java -> InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/csedashboard/OracleCSESITableDAO.java
	new file:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/csedashboard/OracleCSESIbyProviderLocationTableDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/ICircuitDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/IDeviceDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/IPriceDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/IProviderLocationDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/IRoleDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/IServiceDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/IServiceLocationDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/ITaskDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/IUserDAO.java
	new file:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/csedashboard/SIRecordByProviderLocation.java
	new file:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/paging/FragmentList.java
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/IEdashboard.jsp
Merge https://github.com/xottabut/InternetProviderWind

Conflicts:
	InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleUserDAO.java

	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleUserDAO.java