Update resource documentation
add support for master extra config
Add tests for pull request
Merge branch 'feature/master-extra-config' into develop