Merge branch 'development'
removed .gitignore
Merge commit 'd5409' into development