Revert "Revert "Bumping parquet libs to 1.2.5-cdh4.6.0-p485""

This reverts commit 7678eff048d70e79e487ead25c5d3fdb7e8be8a4.

Conflicts:
	project/build.scala