semi working
Merge branch 'android_network'
made lots of changes