Snapshot 13w17a

Added Hay, Hardened Clay and Carpet

This pull request also updates the snapshot branch with the current code from master.