Merge branch 'LDC-460' of https://github.com/mlabrecque/imagex_contest into hotfix/LDC-460