fix
Merge origin/master

Conflicts:
	src/java/controller/Controller.java
	web/response.jsp