Drupal Core Updates
Security updates
Merge branch 'updates' into dev
Update grid tpl
Add .DS_Store in .gitignore, set blog fields display