Removed auto-logout (the was an issue with useing response.getWriter()
to print out scriplets, <%...%>). Updated the layout to all Network
Management Engineer pages.
Merge branch 'master' of https://github.com/Declan-Murphy/Group6.git

Conflicts:
	Copy of
org.dt340a.group6.sprint1/WebContent/WEB-INF/src/org/dt340a/group6/sprint1/persistence/PersistenceUtilTest.java