Merge pull request #30 from theodi/client-dev

Merge rule files
merge master
Merge pull request #31 from theodi/client-dev

Add time-series database and tools
added web directory and files
Merge branch 'master' of https://github.com/theodi/colleen
changed web root from client to web
merge web site