build20140804
Merge branch 'master' of https://github.com/jescacena/cisp4android
build20140804-2