#156 Remove Session ID from the URL
  Moved to servlet 3.0
Merge branch 'dev' into editor-deletes-rating

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Merge branch 'master' into dev