added test.jsp
added database sql file
Merge remote-tracking branch 'upstream/master'

Conflicts:
	WebContent/index.html