Added search bar, moved some thing out of permanent header
Merge remote-tracking branch 'upstream/development' into development

did som things