Merge branch 'master' into marty
Added in code to display slate images if present
Merge branch 'marty'
Merge branch 'Dustin'
Merge branch 'master' into Dustin