servlet part refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/test/spec/TodoTest.js
	src/main/webapp/testrunner.html