fixed merge error, updated examples to use jquery-1.10.1 and to use main jclock library, removed jsspec