Moving stuff to line up with the resolution.
Merge branch 'master' into zacDev
Merge branch 'zacDev'
Add in layout in background and meta files.
Moving window and avatar bumpers to the edge of the screen.
Merge branch 'zacDev'
Updated Layout
Merge branch 'master' into tonyDev