working on problems with Contact.all
Merge branch 'master' into contact-photo
switching branches
fixes merge conflicts
to pull changes down
fixes merge conflict
fixes create contact