Timer works 100% BUT

Isn’t displayed…
Merge branch 'master'

Conflicts:
	nbproject/private/private.xml