updated .gitignore
Merge branch 'development'