Changed android support library
Merge branch 'changeLibraries'