silence `git stash`
add testing To Do
try to fix merge conflicts with gitattributes
Merge branch 'master' into chrome-app

* master:
  try to fix merge conflicts with gitattributes
  add testing To Do
  silence `git stash`