- Edit filr .gitignore
Merge branch 'develop' of asoft.git:plum/plum into without-start-stripes