Updated with latest master. Finalized add/remove/manage project file. Added manage company info. Finalized add comment. Made list views for instructor.
Merge branch 'master' of git://github.com/edavlatian/seneca-Project-Management into temp

Conflicts:
	PRJ666-Implementation/nbproject/private/private.xml
	PRJ666-Implementation/src/java/seneca/projectManagement/entity/UserSession.java
	PRJ666-Implementation/src/java/seneca/projectManagement/persistence/PersistenceController.java
	PRJ666-Implementation/web/pages/Admin/ApproveComments.jsp
	PRJ666-Implementation/web/pages/Admin/AvailableProjects.jsp
	PRJ666-Implementation/web/pages/Admin/CreateAccounts.jsp
	PRJ666-Implementation/web/pages/Admin/EditAccounts.jsp
	PRJ666-Implementation/web/pages/Admin/HomeAdmin.jsp
	PRJ666-Implementation/web/pages/Admin/ManageAccounts.jsp
	PRJ666-Implementation/web/pages/Admin/PendingComments.jsp
	PRJ666-Implementation/web/pages/Admin/ProjectDetails.jsp
	PRJ666-Implementation/web/pages/Admin/ProjectSetPast.jsp
	PRJ666-Implementation/web/pages/Admin/ProjectUpdate.jsp
	PRJ666-Implementation/web/pages/Admin/UpdateAccounts.jsp
	PRJ666-Implementation/web/pages/Admin/newAccounts.jsp
	PRJ666-Implementation/web/pages/Company/AddProjectComment.jsp
	PRJ666-Implementation/web/pages/Company/AddProjectFile.jsp
	PRJ666-Implementation/web/pages/Company/AgreementForm.jsp
	PRJ666-Implementation/web/pages/Company/HomeCompany.jsp
	PRJ666-Implementation/web/pages/Company/ManageProjectFile.jsp
	PRJ666-Implementation/web/pages/Company/RegisterCompany.jsp
	PRJ666-Implementation/web/pages/Company/RegisterForm.jsp
	PRJ666-Implementation/web/pages/Company/RemoveProjectFile.jsp
	PRJ666-Implementation/web/pages/Company/ViewAvailableTeams.jsp
	PRJ666-Implementation/web/pages/Company/ViewCompanyProjects.jsp
	PRJ666-Implementation/web/pages/Company/ViewProjectDetails.jsp
	PRJ666-Implementation/web/pages/Home.jsp
	PRJ666-Implementation/web/pages/Instructor/ApprovedProjects.jsp
	PRJ666-Implementation/web/pages/Instructor/CreateTeam.jsp
	PRJ666-Implementation/web/pages/Instructor/HomeInstructor.jsp
	PRJ666-Implementation/web/pages/Instructor/PendingProjects.jsp
	PRJ666-Implementation/web/pages/Instructor/ProjectDetails.jsp
	PRJ666-Implementation/web/pages/Instructor/ProjectSetApproved.jsp
	PRJ666-Implementation/web/pages/Instructor/matchTeam.jsp
	PRJ666-Implementation/web/pages/Instructor/matching.jsp
	PRJ666-Implementation/web/pages/Instructor/newAccounts.jsp
	PRJ666-Implementation/web/pages/Instructor/updateProjects.jsp
	PRJ666-Implementation/web/pages/ProjectDetails.jsp
	PRJ666-Implementation/web/pages/Supervisor/AvailableProjects.jsp
	PRJ666-Implementation/web/pages/Supervisor/ProjectDetails.jsp
	PRJ666-Implementation/web/pages/Supervisor/ProjectSetPast.jsp
	PRJ666-Implementation/web/pages/Supervisor/ProjectUpdate.jsp
	PRJ666-Implementation/web/pages/Team/ProjectDetails.jsp
	PRJ666-Implementation/web/pages/Team/manageTeamPage.jsp
	PRJ666-Implementation/web/pages/Team/memberPage.jsp
	PRJ666-Implementation/web/pages/Team/teamHome.jsp
	PRJ666-Implementation/web/pages/Team/teamProject.jsp
	PRJ666-Implementation/web/pages/Team/updateTeam.jsp
	PRJ666-Implementation/web/pages/Team/viewProjects.jsp
	PRJ666-Implementation/web/pages/archived.jsp
	PRJ666-Implementation/web/pages/login.jsp
	PRJ666-Implementation/web/pages/resources/css/pageStuff.css
	PRJ666-Implementation/web/pages/validation/processFile.jsp
	PRJ666-Implementation/web/pages/validation/processInstructor.jsp
Link fixes on home