trying to commit updated x-timer
updating x-timer
Merge branch 'client-side' into gh-pages

Conflicts:
	scripts/framework/x-timer/x-timer.js