auth config
Merge remote-tracking branch 'origin/master'

Conflicts:
	wa-config/auth.php