d
Merge branch 'wp_development' of https://github.com/dewedrop/wp-repository into wp_development

Conflicts:
	.gitignore