fixed bugs caused by introducing time into temp data
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/Scripts/cs4Scroll.js
	public/Scripts/cs4Start.js
fixed bugs caused by introducing time into temp data