Merge remote-tracking branch 'origin/master'

Conflicts:
	.meteor/packages
	packages/.gitignore
	smart.lock