some tweaks, refactor
Merge branch 'master' of https://github.com/fada21/android-l-preview-playground