resources page
Merge branch 'issue-61' into develop