Merge branch 'master' of https://github.com/slezh12/Paputka

Conflicts:
	WebContent/CreateEvent.jsp
	WebContent/CreateWantToGo.jsp
jfhstjydta
kjbkjb