Merge to 4.7.0

Conflicts:
	UPGRADE.asciidoc

.gitignore

@@ -25,7 +25,6 @@ db/pf-schema.sql
 raddb/eap.conf
 raddb/radiusd.conf
 raddb/sql.conf
-conf/templates/*
 conf/adminroles.conf
 conf/authentication.conf
 conf/floating_network_device.conf
@@ -63,6 +62,17 @@ html/captive-portal/captive_portal.conf
 conf/pfdetect_remote.conf
 conf/pfarp_remote.conf
 conf/allowed-gaming-oui.txt
+conf/templates/emails-billing_confirmation.txt.tt
+conf/templates/emails-guest_admin_pregistration.txt.tt
+conf/templates/emails-guest_email_activation.txt.tt
+conf/templates/emails-guest_email_preregistration.txt.tt
+conf/templates/emails-guest_email_preregistration_confirmed.txt.tt
+conf/templates/emails-guest_local_account_creation.txt.tt
+conf/templates/emails-guest_registered.txt.tt
+conf/templates/emails-guest_sponsor_activation.txt.tt
+conf/templates/emails-guest_sponsor_confirmed.txt.tt
+conf/templates/emails-guest_sponsor_preregistration.txt.tt
+html/pfappserver/pfappserver.conf
 
 
 # translations