Merge pull request #238 from bnogas/master-p5

Aleksander Machniak

2014-10-24 9d0d40308c79218419e24d3d118f4bcf09df059b

../../program/resources does not exist in tree 5ad07be410795722a898cb23c87f6c70bd13faaa