replaced colors in nag and changed paddings/margins in flipped images
Merge branch 'master' into gh-pages