cleaning up and refactoring

design still needs to be worked on a bit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/src/main/webapp/pages/getUserDetails.jsp
	Source/src/main/webapp/pages/template/header.jsp