backend change
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/WEB-INF/views/restaurant.jsp