1 update
Merge remote-tracking branch 'origin/master'

Conflicts:
	coding/myHandlersAdmin.py
	index.yaml
	templates/aTarifGroup.html