Updating core drupal
Merge pull request #10 from barraponto/master

Update core drupal
Merge remote-tracking branch 'upstream/master' into panopoly