Updated gitignore
merging 'feature-1' into develop