Merge branch 'master' into edge
dev – ignore site images
work – edit dates for Améo & RipStix thumbnails
dev – update CodeKit config
Merge branch 'edge'