Merge pull request #471 from zhanghongyan/dev

Dev
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
测试用例完成！
修改bug
Merge remote-tracking branch 'upstream/master' into dev
Merge remote-tracking branch 'upstream/dev' into dev
改用plugin接口，对底层dom扩展
添加inlieBlockNeedsLayout support检测
Merge pull request #556 from liaoxuezhi/dev

Dev