Update git tracking to track folder 'common'
Merge branch 'contentUI'