Merge remote-tracking branch 'upstream/master'
order notes correctly and use paragraph instead of p
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into test-branch
sort array by footnote_index
sort array by footnote_index
Merge branch 'test-branch'
Merge branch 'master' of https://github.com/surreal8/OSCI-Toolkit