Merge branch 'devbranch'
Merge branch 'devbranch'
Merge branch 'devbranch'
Merge branch 'devbranch'
Merge branch 'devbranch'
Merge branch 'devbranch'
attempt to fix media files
attempt to fix media files #2
fixed home page media issue
Merge branch 'master' into devbranch