Add resources page
Merge with master