Merge pull request #4 from twurz/master

merging Marco & Travis' CC-08 updates
saving current status
trying to resolve merge conflict
Merge pull request #5 from twurz/master

fixed db, needs work on queries
Merge pull request #6 from twurz/master

pulling Marko & Travis' changes before syncing updated db_spec
Merge pull request #7 from JulesVan/master

merging updates