updated server with avatar images
Merge branch 'dev' into paul
templating is working