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