Merge branch 'master' of /var/www/adwords-up with conflicts.
Merge remote-tracking branch 'origin/master'
main settings validation