User model and attachment completed
Merge branch 'user-attachments' into development