Removed Panel
Merge branch 'develop'