Add margin-bottom to FA headers with border
Merge branch 'refs/heads/master' into test