Now use time_template by default

Conflicts:

	pack/services/event_waiting.cfg
Resolved previous conflict