show table for front end
Merge remote-tracking branch 'origin/master'

Conflicts:
	testJquery.html