add search item in page history
Merge branch 'develop' of http://ws-dc-01/scm/git/DSM into develop
ADD search function to history page
fix conflicts
fix conflicts
fixed conflict