jsp updated
Merge branch 'master' of https://github.com/basdag/08707.git

Conflicts:
	WebContent/navigation.jsp