Added Timestamp to object type inspector
Fixed shark-shell startup issue.
Merge branch 'master' into master-csd

Conflicts:
	src/main/scala/shark/repl/SharkILoop.scala