Changes
Merge branch 'master' of https://github.com/siarheiNaralenkau/CafeBooking

Conflicts:
	BookingServer2.war
	updates_to_complete_v1.txt