changed nav links to hide if not there, sorry Amy
Merge remote-tracking branch 'origin/design-2012-11-13' into design-2012-11-13