upgrade wp to 4.
Merge branch 'develop'