Gallery 1 & 2 Fixes
Merge branch 'master' of https://github.com/withcenter/x