Major navigation updates.  Added badges pages. Updated cv page.
conflict resolution