Merge branch 'development'
updated gitignore