Fix timestamp timer not fired
Merge pull request #2731 from Atlante45/fix_for_non_fired_timestamp_timer

Fix timestamp timer not fired
Merge branch 'master' of https://github.com/worklist/hifi into fixtimestamps

Conflicts:
	libraries/shared/src/SharedUtil.cpp