Changed height of controlfrog panels
Merge remote-tracking branch 'origin/master' into gh-pages