Fixed image issue in chrome, broke firefox
Merge branch 'master' into FinalUserProfile
merge