Merge branch 'master' of github.com:phi1ipp/rzd

Conflicts:
	.idea/rzd.iml
	.idea/workspace.xml
	resources/php/TicketService.wsdl
	resources/php/TicketService.xsd
	src/com/grigorio/rzd/MainController.java
Merge branch 'master' of github.com:phi1ipp/rzd