update
Merge branch 'master' of https://github.com/johannheyne/wordpress-toolset

Conflicts:
	README.md
fix