Sorted entries in .gitignore alphabetically. (Remember to do that in the future too, otherwise...)
Merge branch 'develop'