new plugins
Merge branch 'master' of https://github.com/mnizinski79/Network-Packaging-Partners

Conflicts:
	wp-config.php
Merge branch 'master' of https://github.com/mnizinski79/Network-Packaging-Partners

Conflicts:
	config.codekit