pull from liuxin 20170418#78

Merged

eloiseh merged 362 commits into

eloiseh:masterfrom

onlyliuxin:master

Apr 18, 2017

This pull request is big! We're only showing the most recent 250 commits

Commits on Apr 6, 2017

Commits on Apr 7, 2017

Commits on Apr 8, 2017

Commits on Apr 9, 2017

Commits on Apr 10, 2017

Commits on Apr 11, 2017

Commits on Apr 12, 2017

Commits on Apr 15, 2017

Commits on Apr 16, 2017

Commits on Apr 17, 2017