1.7 Preparation

Cleaned the branch from MC 1.6.
Moving to MC 1.7