Merge branch 'develop'
Added .gitignore to ignore some generated files.