Update code according scala code style

Conflicts:
	src/main/scala/shark/parse/SharkSemanticAnalyzer.scala
Update code style