use phpfolding to fix php slow issue, set indent line char to |
Merge branch 'master' into ubuntu