Merge branch 'master' into contacts
adding resources and minor connection name change
Merge branch 'master' into contacts
Merge branch 'master' into contacts
can route to individual contacts
fixed merge conflicts
can show/hide allContacts
button styling/moved for better layout
expanded the allContacts ngShow/Hide AoE
added search functionality but messes up w/out orderby
deleted contact_show.html--now in dashboard
resolved conflicts