Merge pull request #176 from marcoliverteschke/master

Thomas B.

2014-04-18 8087b13d20019b506b701bc8f5e5d6d2a0fa6a54

../../program/resources does not exist in tree 95ec1ee59ae73a5bc03c2b07eb88f4c8fdd2cc53