text:upload user avatar
Merge branch 'master' of https://github.com/brucewar/share_picture

Conflicts:
	controllers/user.js
	routes.js