formatting
fixed tests, configured integration tests
Merge branch 'jetty_test'

Conflicts:
	src/main/webapp/WEB-INF/web.xml