Made scala shell script more robust
Reverted run-class.sh to original
Merge branch 'scala-shell'