Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/ru/tsystems/jsproject/sbb/Controller/Beans/GetPassengersBean.java
	src/main/java/ru/tsystems/jsproject/sbb/Controller/Beans/GetTrainsBean.java
	src/main/java/ru/tsystems/jsproject/sbb/Controller/Beans/TrainInfo.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/DaemonEJB.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/PassengerDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/RouteDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/RunDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/StationDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/TicketDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/TrainDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/WaypointDAO.java
	src/main/webapp/clientHeader.xhtml
	src/main/webapp/employeeHeader.xhtml
	src/main/webapp/index.xhtml
	src/main/webapp/register.xhtml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/ru/tsystems/jsproject/sbb/Controller/Beans/GetPassengersBean.java
	src/main/java/ru/tsystems/jsproject/sbb/Controller/Beans/GetTrainsBean.java
	src/main/java/ru/tsystems/jsproject/sbb/Controller/Beans/TrainInfo.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/DaemonEJB.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/PassengerDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/RouteDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/RunDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/StationDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/TicketDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/TrainDAO.java
	src/main/java/ru/tsystems/jsproject/sbb/Model/DAO/WaypointDAO.java
	src/main/webapp/clientHeader.xhtml
	src/main/webapp/employeeHeader.xhtml
	src/main/webapp/index.xhtml
	src/main/webapp/register.xhtml