udpate ignore list
Merge branch 'master' into retina