tachyon with spark. Version.java is generated automatically.
Merge branch 'master' of github.com:hobinyoon/tachyon into s3

Conflicts:
	src/main/java/tachyon/Version.java
Revert "tachyon with spark. Version.java is generated automatically."

This reverts commit eb5ae908688c4cd45e0c1033d069c406e3557f52.