recreated seeds, tweaked nav bar, and items index
fixed merge conflict in user nav
updated seeds
Merge branch 'master' into fix_view_bugs