fixing my local checkout, I found some changes?
added a test for addfaction.
removing struct player, since it is not in use.
Merge remote-tracking branch 'eressea/master'

Conflicts:
	src/kernel/order.c
use init_order, it is better than the init_tokens+skip_token pattern.
test for new_units.
additional testing for init_order (renamed from init_command)and init_tokens.
fixed a memory access error when kwd==NOKEYWORD.
make getstrtoken() return null at EOL, kill init_tokens.
init_order all the things!
added a bunch of new assertions to cover for oversights.
added some new tests for order parsing.
Merge branch 'master' of github.com:eressea/server
Merge branch 'master' of github.com:badgerman/eressea
remove unused static function, fix missing include for gcc.