Merge branch 'master' into dev-2

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Add template return value and fix vc10, vc11 bugs
添加模板返回值，优化vc10和vc11的模板函数

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Update dumpImageSize version to 1.1.5.4
更新dumpImageSize版本到1.1.5.4

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Merge branch 'fix-dump-template' into dev-2

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Merge branch 'dev-2'

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>