change page reservation tours
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	src/main/webapp/login.jsp
Merge remote-tracking branch 'origin/master'
change page reservation tours