implemented keyword and date search
fixed merge conflicts
fixed merge conflicts
removed test line
Merge branches 'keysearch' and 'master'
fixed merge conflict