***Finished Resubmission Feature
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of C:\Users\Nl0st\ITY\GN3\autobahn-android with conflicts.
Fixes