Adding datepicker
Merge remote-tracking branch 'origin/master'

Conflicts:
	hci_prj/WebContent/Index.jsp