css timer
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/css/sgs.css
Merge remote-tracking branch 'origin/master'
ajax-loader