changes
Merge branch 'master' of https://github.com/johnfonte/stredm-android