fixed profile avatar saving stuff.
merging changes;
merge with recent commit ...