add uniform images
Merge branch 'master' into concat_sass