...

Signed-off-by: Mattias Andrée <maandree@operamail.com>
Merge branch 'develop' of github.com:maandree/tbrpg into develop