parsestore
Merge branch 'master' into pz_adds_aviary
merged master and added .gitattributes file