skip timeCanvas
solve conflict

Conflicts:
	Ver1.0/mainserver/static/js/moment_ds.js