Fix links to images
Merge branch 'release/2013-12-23' into develop