Fixing contentBean conflict issue
Merge branch 'develop'