mend Meng's code ,now merging 12.16

Merge remote-tracking branch 'backup/master'

Signed-off-by: Point1 <Point1@abcd-PC>
bind uploadify for subpage projectUpload



Signed-off-by: Point1 <Point1@abcd-PC>
Merge branch 'FromGU'

Signed-off-by: Point1 <Point1@abcd-PC>
bind uploadify for subpage projectUpload&solve bug in chrome


Signed-off-by: Point1 <Point1@abcd-PC>
Merge branch 'FromGU'

Conflicts:
	WebContent/ProjectUpload.jsp
	WebContent/mainPage.jsp
	src/webController/UserDel.java
change hostpage section1

Merge to master branch

Signed-off-by: Point1 <Point1@abcd-PC>
Merge branch 'FromGU'

Conflicts:
	WebContent/ProjectUpload.jsp
	WebContent/mainPage.jsp
	src/webController/UserDel.java
Signed-off-by: node5 <Gbluepearl777@gmail.com>
Merge branch 'FromGU'

Conflicts:
	WebContent/ProjectUpload.jsp
	WebContent/mainPage.jsp
	src/webController/UserDel.java


Signed-off-by: Point1 <Point1@abcd-PC>
Signed-off-by: Meng <Gbluepearl777@gmail.com>
Merge branch 'FromMeng'

Signed-off-by: Meng <Gbluepearl777@gmail.com>
add new table action

Signed-off-by: Point1 <Point1@abcd-PC>
Merge remote-tracking branch 'backup/FromGU' into FromGU

Conflicts:
	WebContent/js/useruploadcustom.js
	src/model/UserClient.java
Merge branch 'FromGU'
Merge remote-tracking branch 'backup/master'

Conflicts:
	WebContent/js/useruploadcustom.js
	src/model/UserClient.java
	src/webController/UploadServlet.java