Merge branch 'search' into opencv
Merge branch 'search' into opencv
Merge branch 'opencv' into new_master
improve tagging view by adding note and time
fix conflicts
Merge branch 'new_master' into search