! Fixed avatar resizing being off by one. Also fixed uploaded avatars not working properly in some cases. This may not be applicable in future with the custom avatar directory stuff but for now this means it does work.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1202 from Arantor/release-2.1

! Fixed avatar resizing being off by one. Also fixed uploaded avatars no...