made derby a file-based DB
cleaned up excessive logging
linked reportgenerator to aggregator (every 100 seconds now)
fixed derby sql queries
Merge remote-tracking branch 'remotes/origin/master'