add social traits and default categories
stuck in merge hell
Merge branch 'master' of github.com:infecto/project-dates