Changed AFR calendar views
Change AFR calendar category headings to H2
Merge branch 'refs/heads/master' into test