合并Develop，准备发布2.6.0版本#184
Merged
binarywang merged 74 commits intomasterfrom Apr 13, 2017
Merged
Commits
Commits on Dec 23, 2016
Commits on Feb 13, 2017
Commits on Feb 14, 2017
Commits on Feb 19, 2017
Commits on Feb 21, 2017
Commits on Feb 25, 2017
Commits on Mar 1, 2017
- committed
- committed
Commits on Mar 4, 2017
Commits on Mar 5, 2017
- committed
- committed
- committed
- committed
Commits on Mar 9, 2017
- committed
Commits on Mar 10, 2017
- committed
- committed
Commits on Mar 13, 2017
Commits on Mar 14, 2017
- authored
- committed
- authored
- committed
- authored
- committed
Commits on Mar 20, 2017
- committed
Commits on Mar 21, 2017
- committed
- committed
- committed
- committed
Commits on Mar 22, 2017
- committed
- committed
- committed
- committed
- committed
Commits on Mar 23, 2017
- committed
- committed
- committed
- committed
Commits on Mar 24, 2017
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Mar 27, 2017
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Mar 28, 2017
- committed
- committed
- committed
- committed
Commits on Mar 29, 2017
- committed
Commits on Mar 30, 2017
- committed
- committed
- committed
- committed
Commits on Mar 31, 2017
- committed
Commits on Apr 10, 2017
- committed
- committed
- committed