Merge remote-tracking branch 'origin/headless' into sbt-0.13
fix bin/shell.sh to work with sbt 0.13
Merge branch 'sbt-0.13' into scala-2.11

Conflicts:
	bin/shell.sh