server
Merge remote-tracking branch 'origin/master'

simulataneous changes to httpproxy class
server, database, cache and decision tree