Add packager plugin.
Merge remote-tracking branch 'origin/server' into test

Conflicts:
	cli/build.sbt