Merge pull request #1 from cesine/master

Combining libraries and removing Android 2.2 code and touchdb