deleted:    Docs/Use-cases/Boreas Internet Provider 'Wind' (Use cases) version2.docx
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/CommandHelper.java
	new file:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/registration/Registration.java
	new file:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/registration/Validation.java
	new file:   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/java/com/netcracker/wind/dao/interfaces/IUserDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/Registration.jsp
Merge https://github.com/xottabut/InternetProviderWind

Conflicts:
	InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/CommandHelper.java

	modified:   Docs/Scripts/boreas-beta-0.8.sql
	modified:   Docs/Scripts/fillwithDisconnect.txt
	modified:   Docs/reports/Report.xlsx
	modified:   InternetProvider/InternetProvider-web/nb-configuration.xml
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/CommandHelper.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/DashboardsUtilities.java
	deleted:    InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/NameGenerator.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/csedashboard/CSEgetOwnCompletedTasks.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/csedashboard/CSEgetOwnTasks.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/csedashboard/CSEgetOwnUncompletedTasks.java
	deleted:    InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/iedashboard/CompleteNewCable.java
	deleted:    InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/iedashboard/CompleteNewDeviceTask.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/CreateDevice.java
	renamed:    InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/iedashboard/CompleteDeleteCable.java -> InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/iedashboard/getActiveTasks.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/order/CancelOrder.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/order/ConfirmOrder.java
	new file:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/order/OrderDisconnectSI.java
	new file:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/order/OrderModifySI.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/order/OrderUtilities.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/order/ProceedToOrder.java
	renamed:    InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/pedashboard/CompleteTask.java -> InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/pedashboard/DeleteCircuit.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/commands/implementations/pedashboard/SelectTask.java
	renamed:    InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/pedashboard/CreateCircuit.java -> InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/pedashboard/SetupCircuit.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/controllers/PrivateController.java
	renamed:    InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/helper/AbstractDAO.java -> InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/helper/AbstractOracleDAO.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/OraclePriceDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleProviderLocationDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleRoleDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleServiceDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleServiceInstanceDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleServiceLocationDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleServiceOrderDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleTaskDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/OracleUserDAO.java
	new file:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/csedashboard/CSESITableDAO.java
	deleted:    InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/reports/AbstractOracleDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/reports/OracleCiaIptDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/reports/OracleRiMostProfRouterDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/reports/OracleRiRoutersUtilNCapDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/reports/OracleSiOrdersDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/implementations/oracle/reports/OracleSiProfitDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/ICableDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/IPortDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/IServiceInstanceDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/IServiceOrderDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/ITaskDAO.java
	new file:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/dao/interfaces/csedashboard/ICSEDashboardDAO.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/Cable.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/Circuit.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/Device.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/Port.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/Price.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/ProviderLocation.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/Role.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/Service.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/ServiceInstance.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/ServiceLocation.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/ServiceOrder.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/Task.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/User.java
	new file:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/csedashboard/CSEDashboardEntity.java
	new file:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/entities/csedashboard/SIRecord.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/workflow/TaskCreator.java
	modified:   InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/workflow/Workflow.java
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/CSEdashboard.jsp
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/CiaIpt.jsp
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/IEdashboard.jsp
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/RiMostProfRouter.jsp
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/SiOrders.jsp
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/SiProfit.jsp
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/WEB-INF/classes/displaytag.properties
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/WEB-INF/classes/reports/templates/template_cia_ipt.xls
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/WEB-INF/classes/reports/templates/template_ri_most_prof.xls
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/WEB-INF/classes/reports/templates/template_ri_util_n_cap.xls
	modified:   InternetProvider/InternetProvider-web/src/main/webapp/index.jsp