update for new container types
Merge branch '7.x-1.x-dev' of github.com:palasthotel/grid-drupal into 7.x-1.x-dev