Merge origin/master

Conflicts:
	NetBeansProjects/Training Management System/web/course_delete.jsp
	NetBeansProjects/Training Management System/web/course_edit.jsp
	NetBeansProjects/Training Management System/web/course_new.jsp
	NetBeansProjects/Training Management System/web/course_view.jsp
Merge origin/master

Conflicts:
	NetBeansProjects/Training Management System/web/course_delete.jsp
	NetBeansProjects/Training Management System/web/course_edit.jsp
	NetBeansProjects/Training Management System/web/course_new.jsp
	NetBeansProjects/Training Management System/web/course_view.jsp
Merge origin/master

Conflicts:
	NetBeansProjects/Training Management System/web/applyForCourse_status.jsp
	NetBeansProjects/Training Management System/web/bootstrap.jsp
	NetBeansProjects/Training Management System/web/generateCertificate.jsp
	NetBeansProjects/Training Management System/web/module_verify.jsp
	NetBeansProjects/Training Management System/web/report_view.jsp