added token (Gernot)
Merge branch 'master' of https://github.com/aim42/aim42

Conflicts:
	.travis.yml