fixed content open
Merge branch 'develop'
recompiled