Merge pull request #84 from gusaus/7.x-1.x-panels

switching from gusaus to pushtape
changing caps issue