upload handlers + avatar html output
Merge remote-tracking branch 'master/master'