navigation fixed
Merge branch 'master' into hackathon_suresh