@ .gitignore: updated
Merge branch 'develop'