updated nav
fixed conflicts with layout
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev