fixed assets
Merge branch 'assetFix' into development

merging in Jason's asset fixes. just removing unnecessary whitespace