1

2
Merge remote-tracking branch 'origin/master'

Conflicts:

	UniRestaurants/UniRestaurants/src/main/webapp/WEB-INF/layouts/default.jspx

	UniRestaurants/UniRestaurants/src/main/webapp/WEB-INF/views/cities/edit.jspx