Add keywords to user model
Merge branch 'master' of github.com:jcc333/collaborateur