migrate to new versions of android support libs, some refactoring
Merge remote-tracking branch 'origin/master'