shortcut auto gen
change to jetty 9
Merge branch 'develop'

Conflicts:
	src/main/webapp/index.html