Merge branch 'master' into search
Merge branch 'master' of https://github.com/SEL-Columbia/Revisit-Server into search
merged deleted functionality
merged in latest changes