Initial Commit including CouchDB

July 20, 2013
Merge branch 'master' into working-branch