Fix results of merge conflict with Warmonger. + more fixes to barseBonus.
Bonus duration now can be array and parsed to bitmask as designed.

git-svn-id: https://vcmi.svn.sourceforge.net/svnroot/vcmi/trunk@3102 4dfc6b2a-8b31-0410-aa91-d6c70e3ac834