New framework
Merge branch 'master' of https://github.com/inaa/android-workspace