timer with refresh
error with second timer
conflict
Merge branch 'cron' of https://github.com/PIIT/pi_call_center into cron

Conflicts:
	js/test.js