Kill Boris 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	katana/src/main/java/org/jedev/control/BacklogServlet.java