change search view with catagory
add catagory search
merge with new version
Merge branch 'master' of https://github.com/quan32/ITJ