* vuejs-templates/master: (54 commits)
  v1.2.3
  remove double FriendlyErrorsPlugin (fix vuejs-templates#1064)
  v 1.2.2
  remove unnecessary minimize option (close vuejs-templates#1056)
  Make sure that imported css files in SFCs are autoprefixed, too (vuejs-templates#1053)
  reduce clientLogLevel
  remove `express` from package.json (vuejs-templates#1060)
  Remove extra commas (vuejs-templates#1050)
  1.2.1 - Bugfix release (vuejs-templates#1052)
  bumb version string in config in package.json
  bumb version string in config
  re-add postcss-loader
  Fix typos and formatting (vuejs-templates#1048)
  fix(jest): fix Jest coverage directory (vuejs-templates#1046)
  Remove unnecessary whitespaces (vuejs-templates#1047)
  re-merge (vuejs-templates#1045)
  Set ExtractTextPlugin.allChunks to true (vuejs-templates#1027)
  pass cssSourceMap option to vue-loader (vuejs-templates#756)
  Grammar and typo fixes on docs (vuejs-templates#992)
  Use webpack 3's standard way to generate a manifest in CommonsChunkPlugin (vuejs-templates#1028)
  ...

# Conflicts:
#	meta.js
#	template/config/index.js
#	template/index.html
#	template/package.json

* re-merge (vuejs-templates#1045)

* Reference dev script in start script instead of copy pasting (vuejs-templates#894)

Less duplication FTW.

* add version tag to config/index.js

* stick to ES5

this file is not transpiled

* Bumping Vue+VueRouter versions, some minor fixes. (vuejs-templates#986)

* switch hello-world tag to PascalCase (vuejs-templates#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (vuejs-templates#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (vuejs-templates#984)

- vue 2.5
- vue-router 3.0

* Fix missing dependency bumps (vuejs-templates#987)

* switch hello-world tag to PascalCase (vuejs-templates#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (vuejs-templates#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (vuejs-templates#984)

- vue 2.5
- vue-router 3.0

* fix missing dependency updates for

* vue-template compiler
* vue-loader

* bump version string

* Fix Unknown plugin istanbul error when no unit test (vuejs-templates#785)

* Fix Unknown plugin istanbul error when no unit test

* simplify handlebars conditionals.

* Revert "Fix Unknown plugin istanbul error when no unit test (vuejs-templates#785)" (vuejs-templates#1035)

This reverts commit 14f2a92.

* Remove unnecessary whitespaces (vuejs-templates#1047)

* fix(jest): fix Jest coverage directory (vuejs-templates#1046)

Explicitly set the coverage directory to match Karma and .gitignore

* Fix typos and formatting (vuejs-templates#1048)

* re-add postcss-loader

was mistakenly removed during merge of vuejs-templates#824

* bumb version string in config

* bumb version string in config in package.json