Merge branch 'client-ui' into scaling
theme update css and slider
Merge remote-tracking branch 'remotes/origin/scaling-&-timeline' into krishna

Conflicts:
	client/index.html
	client/template/common/header.html
Timeline start time fix