Buffs - Permanent duration buffs now correctly replace non-permanent version
Officer - Fixed buff duration and errors
Officer - Scatter is now added to the group
Officer - Inspiration and Drillmaster are now added to the group
Merge pull request #220 from Ziggeh/master

Fixed some officer buffs and a permanent buff duration issue