fix a crash when missing a token
Merge branch 'version-3-3'

Conflicts:
	src/build.h
Merge branch 'master' of github.com:eressea/server