fixed hiphop build problems
Merge branch 'master' of https://github.com/vxe/Edwin-Enterprises
housekeeping