adding token
Merge branch 'master' into gh-pages

Conflicts:
	timeblocker/timeblocker1.xml