ignore .user files
Updated project to be current
Merge remote-tracking branch 'origin/master' into Database-testing