two steps upload/avatar edit
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev