Update time only when packets received
Update time only when packets received; Fix merge conflict.

Merge branch 'master' of github.com:webhamster/dump1090

Conflicts:
	public_html/script.js