Updated layouts, changed file formats, updated uploader to search for files.
Updating layouts for android v11
Merge remote-tracking branch 'upstream/master' into jp447
Merge pull request #499 from jaypoulz/jp447

Updating Layouts for v11