timerUpdate

-new buttonView
Merge remote-tracking branch 'origin/master'

Conflicts:
	view/view.pri