Add assembly task to SBT for building a jar of the demo
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.sbt