add timestamp
Merge branch 'push-notification'
Implement timestamp for all states
Merge branch 'master' of https://github.com/tienwei/oddsAre-UI-Polishing

Conflicts:
	www/templates/tab-dash.html