Bug fix
Bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/recoverSend.xhtml
Bug fix