many changes
Merge branch 'master' of
https://github.com/axl411/E-Commerce-Demo-Site.git

Conflicts:
	WebContent/submit_article.jsp
	src/controller/SubmitArticle.java
	src/model/DBFetcher.java