Merge branch 'master' of github.com:mercooreal/Earthquake-android