Used .html as filename extension for templates

In user_profile we're actually extending template.html and not
template.php
Merge pull request #470 from michael-k/fn-ext

Used .html as filename extension for templates
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages