jsp file entry
index.html issue solved
Merge remote-tracking branch 'upstream/master'

Conflicts:
	war/index.html