local commig
Merge branch 'sparksql' of github.com:shiroh/spark_test into sparksql

Conflicts:
	src/main/scala/citi/test/processor/FIXPackage.scala
	src/main/scala/citi_test/SocketConsumer.scala
upgrade hadoop client to 2.4 to fix the bug: fail to create ParquetFile