Merge pull request #21 from apache/asf-site

Apply a 23 commits from asf-site to master to catch up master