updating with android allseen updates
Merge branch 'master' of https://github.com/FirstBuild/ATTHackathon