wluo/bsocial — pull request #2 by misterbisson (2014-01-13 19:29:36+00:00)
Title: Resolve

Resolve conflicts