Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/common/_bower.json
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/common/_package.json
Merge remote-tracking branch 'upstream/master'
Merge commit '5967764023c6140f3c76d87188842951156a48c3'

* commit '5967764023c6140f3c76d87188842951156a48c3':

Conflicts:
	templates/common/_bower.json
	templates/common/_package.json