Additional whois servers + .my template
Merge remote-tracking branch 'origin/new_templates'