update wp to 4.0.1

Conflicts:
	wp
Merge pull request #77 from Granitech/upstream

update wp to 4.0.1