update#1500

guorongsen wants to merge 5 commits intovuejs-templates:developvuejs-templates/webpack:developfrom

guorongsen:developguorongsen/webpack:developCopy head branch name to clipboard