update plugins
Merge branch 'master' of https://github.com/CTSATLAS/wordpress

Conflicts:
	wp-content/plugins/wp.autoload/vendor/autoload.php
	wp-content/plugins/wp.autoload/vendor/composer/autoload_real.php