integrated search form, fixed navi
Merge branch 'new-design' of git://github.com/oat-sa/tao-core into new-design