Merge branch 'master' into psuedo_master
merge fix MainActivity
Merge branch 'psuedo_master'