Updated .gitignore for development branch
Minor edits
Merge branch 'development'