add index to demo
Merge branch 'master' of https://github.com/fhdragon/fhdragon.git

Conflicts:
	demo/pom.xml
	demo/src/main/webapp/WEB-INF/web.xml
	demo/src/main/webapp/views/index.html