fix user controller
Merge branch 'master' of http://github.com/brucewar/share_picture

Conflicts:
	libs/log.js