updated logo on homepage
fix merge erros
updated edit forms
fixing merge errors