fixed conflict with Potential
Merge branch 'ewb' of https://github.com/etano/pimcpp into ewb