Initial commit
initial import
adding lib and android
wiping out old
merge
Merge pull request #313 from Ecotrust/master

merge to master