responsive fix
plugin update
plugin update
minor page fix
database & plugin
page fix
search page fix
plugin update
Merge remote-tracking branch 'origin/master'

Conflicts:
	.htaccess
	wp-config.php
	wp-content/advanced-cache.php
	wp-content/aiowps_backups/index.html
	wp-content/cache/.htaccess
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/general/wp-security-list-table.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/index.html
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/index.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-admin-init.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-admin-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-blacklist-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-brute-force-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-dashboard-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-database-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-filescan-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-filesystem-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-firewall-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-list-404.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-list-acct-activity.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-list-comment-spammer-ip.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-list-locked-ip.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-list-logged-in-users.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-list-login-fails.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-list-registered-users.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-maintenance-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-misc-options-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-settings-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-spam-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-user-accounts-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-user-login-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-user-registration-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/admin/wp-security-whois-menu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/grade-system/wp-security-feature-item-manager.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/grade-system/wp-security-feature-item.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/index.html
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/index.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-backup.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-bot-protection.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-captcha.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-config.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-configure-settings.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-cronjob-handler.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-deactivation-tasks.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-debug-logger.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-file-scan.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-general-init-tasks.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-installer.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-process-renamed-login-page.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-user-login.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-user-registration.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-utility-file.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-utility-htaccess.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-utility-ip-address.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-utility.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-wp-footer-content.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/classes/wp-security-wp-loaded-tasks.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/css/index.html
	wp-content/plugins/all-in-one-wp-security-and-firewall/css/wp-security-admin-styles.css
	wp-content/plugins/all-in-one-wp-security-and-firewall/css/wp-security-site-lockout-page.css
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/arrow.png
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/error.png
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/feature-difficulty-badge-bg.png
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/feature-points-badge-bg.png
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/form_bg.png
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/index.html
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/info-icon.png
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/loading.gif
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/plugin-icon.png
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/plugin-icon2.png
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/shield-info-icon-36.png
	wp-content/plugins/all-in-one-wp-security-and-firewall/images/shield-security-icon-36.png
	wp-content/plugins/all-in-one-wp-security-and-firewall/index.html
	wp-content/plugins/all-in-one-wp-security-and-firewall/js/index.html
	wp-content/plugins/all-in-one-wp-security-and-firewall/js/masonry.pkgd.min.js
	wp-content/plugins/all-in-one-wp-security-and-firewall/js/password-strength-tool.js
	wp-content/plugins/all-in-one-wp-security-and-firewall/js/wp-security-admin-script.js
	wp-content/plugins/all-in-one-wp-security-and-firewall/languages/aiowpsecurity-zh_CN.po
	wp-content/plugins/all-in-one-wp-security-and-firewall/languages/aiowpsecurity.pot
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/index.html
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/LICENSE
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/handler.template.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/npdata.ser
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ae.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.aero.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ag.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.asia.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.at.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.au.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.be.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.biz.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.br.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ca.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.cat.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ch.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.cl.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.client.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.cn.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.co.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.co.za.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.coop.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.cz.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.de.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.edu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.eu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.fi.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.fj.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.fm.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.fr.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.afternic.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.alldomains.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.ascio.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.assorted.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.corporatedomains.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.directnic.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.domaindiscover.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.domainpeople.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.dotster.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.dreamhost.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.enom.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.fabulous.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.fastdomain.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.gandi.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.genericb.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.godaddy.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.iana.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.interdomain.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.itsyourdomain.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.joker.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.markmonitor.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.melbourneit.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.moniker.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.namejuice.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.nameking.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.names4ever.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.namevault.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.networksolutions.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.nicco.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.nicline.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.onlinenic.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.opensrs.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.ovh.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.psiusa.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.publicdomainregistry.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.register.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.rrpproxy.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.schlund.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.srsplus.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.tmagnic.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.tvcorp.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.gtld.wildwestdomains.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.hu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.icon.png
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.idna.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ie.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.in.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.info.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.int.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ip.afrinic.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ip.apnic.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ip.arin.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ip.krnic.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ip.lacnic.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ip.lib.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ip.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ip.ripe.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ir.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.is.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.it.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.jp.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.lt.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.lu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ly.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.main.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.me.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.mobi.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.museum.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.mx.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.name.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.nl.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.nu.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.nz.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.org.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.org.za.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.parser.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.pl.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.pro.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.pt.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ro.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ru.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.rwhois.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.sc.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.se.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.servers.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.si.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.su.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.tel.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.travel.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.uk.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.us.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.utils.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ve.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.ws.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/lib/whois/whois.zanet.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/license.txt
	wp-content/plugins/all-in-one-wp-security-and-firewall/logs/index.html
	wp-content/plugins/all-in-one-wp-security-and-firewall/other-includes/index.html
	wp-content/plugins/all-in-one-wp-security-and-firewall/other-includes/wp-security-rename-login-feature.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/other-includes/wp-security-unlock-request.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/other-includes/wp-security-visitor-lockout-page.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/readme.txt
	wp-content/plugins/all-in-one-wp-security-and-firewall/wp-security-core.php
	wp-content/plugins/all-in-one-wp-security-and-firewall/wp-security.php
	wp-content/plugins/better-delete-revision/better-delete-revision.php
	wp-content/plugins/better-delete-revision/readme.txt
	wp-content/plugins/better-delete-revision/screenshot-1.png
	wp-content/plugins/better-delete-revision/screenshot-2.png
	wp-content/plugins/polylang/languages/polylang-uk.po
	wp-content/plugins/shortcodes-ultimate/languages/su-ja.po
	wp-content/plugins/shortcodes-ultimate/languages/su-ru_RU.po
	wp-content/plugins/wp-super-cache/Changelog.txt
	wp-content/plugins/wp-super-cache/advanced-cache.php
	wp-content/plugins/wp-super-cache/languages/wp-super-cache-zh_CN.po
	wp-content/plugins/wp-super-cache/ossdl-cdn.php
	wp-content/plugins/wp-super-cache/plugins/awaitingmoderation.php
	wp-content/plugins/wp-super-cache/plugins/badbehaviour.php
	wp-content/plugins/wp-super-cache/plugins/domain-mapping.php
	wp-content/plugins/wp-super-cache/plugins/dynamic-cache-test.php
	wp-content/plugins/wp-super-cache/plugins/jetpack.php
	wp-content/plugins/wp-super-cache/plugins/multisite.php
	wp-content/plugins/wp-super-cache/plugins/searchengine.php
	wp-content/plugins/wp-super-cache/plugins/wptouch.php
	wp-content/plugins/wp-super-cache/readme.txt
	wp-content/plugins/wp-super-cache/wp-cache-base.php
	wp-content/plugins/wp-super-cache/wp-cache-config-sample.php
	wp-content/plugins/wp-super-cache/wp-cache-phase1.php
	wp-content/plugins/wp-super-cache/wp-cache-phase2.php
	wp-content/plugins/wp-super-cache/wp-cache.php
	wp-content/plugins/wp-super-cache/wp-super-cache.pot
	wp-content/themes/southpac/css/style.css
	wp-content/themes/southpac/footer.php
	wp-content/themes/southpac/header.php
	wp-content/themes/southpac/js/script.js
	wp-content/wp-cache-config.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	database/southpac.sql
Merge branch 'master' of C:\XAMPP\htdocs\Southpac with conflicts.
Wordpress upgrade