Improve .gitignore
Merge remote-tracking branch 'origin/master' into feature/activity-type