Merge tag '14-08-04' into develop

creating release 14-08-04
Updating .gitignore to only ignore top level '/files' directory
Updating Drupal to 7.31
Merge branch 'release/14-08-19'