merged development
fixed img
backup
plugin working mailmunge todo
fixed forms
update fixed merge conflict