cleanups
Merge branch 'master' of h.github.com:hermanos/echoes-android