Merged master and tesseract versions of Boot.scala and default.html.