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

cleanup
re-export and cleanup of features