Added htaccess from html5boilerplate
Merge branch 'master' into production

* master:
  Added htaccess from html5boilerplate