Changed folder name from 'lib' to 'libs' to fix an issue with Eclipse
Merge branch 'master' of https://github.com/Hyperactivity/android-app