fix #656 panel ui and more button
Merge branch 'master' of github.com:concerto/concerto