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

src/dao/implementation/PeopleDAOImpl.java

src/servlet/people/PeopleEditServlet.java

src/servlet/people/PeopleQueryServlet.java

web/admin.html

web/css/admin.css

web/css/person-project.css

web/css/person-style.css

web/css/person-topbar.css

web/css/style.css

web/css/style2.css

web/css/topbar.css

web/datepicker/dist/css/bootstrap-datepicker.css

web/datepicker/dist/css/bootstrap-datepicker.css.map

web/datepicker/dist/css/bootstrap-datepicker.min.css

web/datepicker/dist/css/bootstrap-datepicker.standalone.css

...tepicker/dist/css/bootstrap-datepicker.standalone.css.map

...tepicker/dist/css/bootstrap-datepicker.standalone.min.css

web/datepicker/dist/css/bootstrap-datepicker3.css

web/datepicker/dist/css/bootstrap-datepicker3.css.map

web/datepicker/dist/css/bootstrap-datepicker3.min.css