Update index.jsp

Hung makes change on this file
test conflic merger
Merge branch 'master' of https://github.com/hdoanthanh/cxf-rest-project
Mfsddaaerge branch 'master' into dev

Conflicts:
	due-conflic.txt