change the sql
Merge branch 'master' of
https://github.com/axl411/E-Commerce-Demo-Site.git

Conflicts:
	WebContent/WEB-INF/web.xml
	build/classes/.gitignore
	src/controller/Author.java
	src/controller/AvailableArticles.java
	src/controller/SearchPaper.java
	src/controller/UploadFile.java