Add avatar field to account settings. Issue #439.
image refactoring
imports fixed
merge branch dev-cleanup into dev-cleanup2
improve templates
Merge branch 'dev-cleanup' into dev-cleanup2
avatars problem solved - directory renamed
Merge branch 'dev-cleanup2' into dev-cleanup
Merge dev-issue439 into dev-cleanup.
Fix avatar selector for dev-cleanup. Issue #439.