fix php
add git-hooks
fix common
fix common (2)
fix common (3)
fix common (4)
fix js, text
fix js
Merge branch 'develop'