Merge branch 'master' of https://gitlab.eng.unimelb.edu.au/973651/comp90082-eportfolio-team03

src/service/LoginServlet.java

src/service/RegisterServlet.java

src/util/StringUtils.java

web/js/Award/awards.js

web/js/Award/awards_admin.js

web/js/Privacy/request.js

web/js/Project/project_display.js

web/js/ToolBar/pagebar.js

web/js/scripts2.js

web/other-person-project.html

web/other-person.html

web/person-project.html

web/person.html

web/webpage/admin-related/admin-background.html

web/webpage/privacy/privacy-candidate.html

web/webpage/privacy/privacy-list.html

web/webpage/privacy/privacy-my.html