Added navigation bar to all pages
Merge branch 'master' of https://github.com/soliverost/happinessapp
ng with latest version in github