fix edit image, admin login
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/WEB-INF/web.xml
	web/admin/product/edit_image.xhtml