endringer
Merge branch 'master' of github.com:iterate/editio

Conflicts:
	WebContent/editio/index.jsp
	src/editio/FileUploadServlet.java