Merged ZenGarden/master and resolved conflicts

Conflicts:
src/PdFileParser.cpp