#109 add config option
#109 functionality for $teamEmailImages
Fix #107
Fix #105 by making sure that numip and numemail are set to 0 before the
checks for acc@toolserver.org or 127.0.0.1.
Revert "#109 add config option"

This reverts commit a778c4e6adcf3577ee4d07738a875391378d7310.
Modify commit 19fe9c75 to be more anti-spam
Merge remote-tracking branch 'enwp/master'
Merge branch 'master' of https://github.com/enwikipedia-acc/waca
Update footer on team.php
Merge pull request #112 from Matthewrbowker/master

Update footer on team.php
Revert "Revert "Revert "Merge pull request #102 from Technical-13/patch-3"""

This reverts commit 2b1ccfa5d03b1eafe94e4adc3360f1ddcf9189fd.

Conflicts:
	templates/zoom-parts/username-section.tpl
Merge remote-tracking branch 'enwp/master' into stable
Merge branch 'master' into defer-to-other-user

Conflicts:
	functions.php