Use .html instead of .xhtml as file extension
Merge branch '3.7'
Add link to API documentation