Merge origin/master

Conflicts:
	web/transfer-edit.jsp