table hovers, grav link, removed maritals, link hovers, removed dups
Merge branch 'master' into front17
Merge branch 'front17'
merge