Annotate domain objects so the SQL Server reserved word 'user' isn't in the db schema
Merge remote-tracking branch 'origin/master'