information page
Merge remote-tracking branch 'origin/hzDisplayProfile' into inforpage
Merge remote-tracking branch 'origin/hzDisplayProfile' into inforpage
nothing changed..
Merge branch 'master' into inforpage
We have a new home page.
Merge branch 'master' into inforpage
agian..
setting page configure
Information page first built, controller works well
settings
Merge branch 'master' into inforpage

Conflicts:
	site/app/partials/_nav.html
reorganizing code into proper files
Merge remote-tracking branch 'origin/inforpage' into hzDisplayProfile
finished reorganizing and make navbar sticky instead of fixed (to fix viewability of nav tabs)