Revert "remove top part"

This reverts commit 84b5cdb6cb206a8db022d5c0b5503f60e8151407.

Conflicts:
	header.php
Revert "remove navbar"

This reverts commit 9e2ed0f80b587416dce09f7d0de3f8df9e4bae8b.

Conflicts:
	header.php
reverted
resolving
Merge branch 'jl/test' of https://github.com/michaelshuh/gracepointresources into jl/test