Adding Resource, Source, Target, Infrastructure
Merge remote branch 'origin/master'