update wp-security plugin to version 4.0.3
update all-in-one-seo-pack to version 2.1
Merge branch 'master' into multisite

Conflicts:
	wp-content/plugins/all-in-one-seo-pack/aioseop_class.php
	wp-content/plugins/all-in-one-seo-pack/aioseop_feature_manager.php
	wp-content/plugins/all-in-one-seo-pack/aioseop_functions.php
	wp-content/plugins/all-in-one-seo-pack/aioseop_module.css
	wp-content/plugins/all-in-one-seo-pack/aioseop_module.js
	wp-content/plugins/all-in-one-seo-pack/aioseop_sitemap.php
	wp-content/plugins/all-in-one-seo-pack/all_in_one_seo_pack.php
	wp-content/plugins/jetpack/modules/sharedaddy/images/sharing-hidden.png
	wp-content/plugins/wp-security-scan/images/wpss_icon_large.png
	wp-content/plugins/wp-security-scan/images/wpss_icon_small_combined.png
	wp-content/plugins/wp-security-scan/index.php
	wp-content/plugins/wp-security-scan/readme.txt
	wp-content/plugins/wp-security-scan/res/css/styles.alerts.css
	wp-content/plugins/wp-security-scan/res/css/styles.base.css
	wp-content/plugins/wp-security-scan/res/images/arrow-black-icon.png
	wp-content/plugins/wp-security-scan/res/images/checkbox.png
	wp-content/plugins/wp-security-scan/res/images/indicator-yellow.png
	wp-content/plugins/wp-security-scan/res/images/support.png
	wp-content/plugins/wp-security-scan/res/inc/WsdCheck.php
	wp-content/plugins/wp-security-scan/res/inc/WsdInfo.php
	wp-content/plugins/wp-security-scan/res/inc/WsdLiveTraffic.php
	wp-content/plugins/wp-security-scan/res/inc/WsdPlugin.php
	wp-content/plugins/wp-security-scan/res/inc/WsdScheduler.php
	wp-content/plugins/wp-security-scan/res/inc/WsdSecurity.php
	wp-content/plugins/wp-security-scan/res/inc/WsdUtil.php
	wp-content/plugins/wp-security-scan/res/inc/WsdWatch.php
	wp-content/plugins/wp-security-scan/res/inc/alerts.php
	wp-content/plugins/wp-security-scan/res/inc/wss-functions.php
	wp-content/plugins/wp-security-scan/res/js/wsd-util.js
	wp-content/plugins/wp-security-scan/res/pages/about.php
	wp-content/plugins/wp-security-scan/res/pages/blog.php
	wp-content/plugins/wp-security-scan/res/pages/dashboard.php
	wp-content/plugins/wp-security-scan/res/pages/database.php
	wp-content/plugins/wp-security-scan/res/pages/live_traffic.php
	wp-content/plugins/wp-security-scan/res/pages/scanner.php
	wp-content/plugins/wp-security-scan/res/pages/settings.php
	wp-content/plugins/wp-security-scan/res/pages/tpl/box-available-backups.php
	wp-content/plugins/wp-security-scan/res/pages/tpl/box-database-backup.php
	wp-content/plugins/wp-security-scan/res/pages/tpl/box-database-change-prefix.php
	wp-content/plugins/wp-security-scan/res/pages/tpl/box-scan-results-file.php
	wp-content/plugins/wp-security-scan/res/pages/tpl/box-scan-results-wp.php
	wp-content/plugins/wp-security-scan/wss-settings.php