update scripts
Merge branch 'master' of https://github.com/chouxiaowen/shark

Conflicts:
	src/main/scala/scripts/Test.scala