Merge remote-tracking branch 'origin/master' into develop
update lifestream
Merge branch 'develop' of https://github.com/lucienzhu/lucienzhu.github.com into develop
Merge remote-tracking branch 'origin/develop'