FInal

I will not touch this shit after this point
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
Revert "FInal"

This reverts commit dee80233f2b5c146601f2693f4804e9ab823d2ed.

Conflicts:

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

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