Merge pull request #162 from nicolas-joubert/patch-1

Thomas B.

2014-03-04 324805e180d56bcec52b77d27c752ed2479ce466

../../program/resources does not exist in tree 0089157a71a0f96caffb68e3e00e1d90137251f3