header, footer update
fixed conflicts

Conflicts:
	web-app/home_body.jsp
	web-app/mapper/mapper.jsp
	web-app/mapper/mapper_body.jsp