upgrade conductor
Merge branch 'master' into conductor_update

Conflicts:
	cards/github-issues/configurations/concat.js
	cards/github-repositories/configurations/concat.js
	cards/github-stars/configurations/concat.js
	glazier-server
	package.json
Merge branch 'conductor_update'

Conflicts:
	glazier-server