Merge pull request #1 from MightyPirates/master-MC1.7.10

Merged official master into local fork
Fixed doc in Tablet.scala
Merge pull request #602 from natedogith1/master-MC1.7.10

Fixed doc in Tablet.scala