Merge branch 'Deathmax-pull-request'
fix a few things after merge.
fix imp naming
Merge remote-tracking branch 'original/master' into pull-request
fix rec added% key collisions
add unit ai
add items