merging content from libphilo and PhiloLogic4-Template libraries
Merge pull request #1 from rwhaling/master

merge upstream