Add EditUserProfile.ftl, UserProfile.ftl
Update menu.ftl
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/university/controllers/admin/AdminController.java