Merge pull request #460 from ironbane/website-update

next round of changes
first concept of site wide search
Merge pull request #461 from ironbane/website-update

next round of changes for the website
Merge branch 'develop' into website-update
add to header of user editor