fixed javascript upload
used trait for contacts
removed contacts object
Merge branch 'user-profile-edit' into user-profile-view
improved contacts