adding api
Updated android files to ubuntu

Merge branch 'master' of https://github.com/marsella/clubhack