ganti jd jsp:include
Merge branch 'master' of https://github.com/daversetyawan/prototype.git

ganti jd jsp:include

Conflicts:
	Prototype/WebContent/assignment/approval.jsp
	Prototype/WebContent/assignment/approval_s.jsp
	Prototype/WebContent/assignment/index.jsp
	Prototype/WebContent/assignment/view.jsp
	Prototype/WebContent/assignment/view_s.jsp
	Prototype/WebContent/employee/add_employee.jsp
	Prototype/WebContent/employee/index.jsp
	Prototype/WebContent/employee/new.jsp
	Prototype/WebContent/project/add_project.jsp
	Prototype/WebContent/project/add_project_structure.jsp
	Prototype/WebContent/project/home_project.jsp
	Prototype/WebContent/project/view_project_structure.jsp