commented out waterline & filepath of database.js
added a newsaggregator tool and separated it from the webclient
merged
successfully mereged in
unified code
Merge pull request #6 from kang/develop

merge me in