updated timestamps
Merge branch 'master' into scroll-card-list

Conflicts:
	app/styles/app.scss