Merge pull request #84 from clintbellanger/master

merge from main project
Merge pull request #89 from clintbellanger/master

merge from main project
Check inventory stacks for slots with a quantity of 0 during save/load

This fixes a stack of 0 gold being added to the player's inventoty in
flare-game.
Abbreviate quantity overlay on icons

If a quantity is over 1000, we remove the last 3 digits (integer divide
by 1000) and add a "K" suffix. Then the actual total is displayed in the
item's long tooltip next to its name.
Merge pull request #704 from dorkster/bugfixes

Check inventory stacks for slots with a quantity of 0 during save/load
Move kilo abbreviation to Util function and make "k" translatable
Remove unnecessary variable
Merge pull request #705 from dorkster/quantity_abbr

Abbreviate quantity overlay on icons
Replace atoi() with toInt()
Merge pull request #706 from dorkster/bugfixes

Replace atoi() with toInt()
Merge remote-tracking branch 'mainline/master' into floatingpointmovement
Merge pull request #93 from clintbellanger/master

merge from main project
Fix party heal & shield buff issue

Use the casters statblock to calculate the effect of the buff, rather
than the targets
Merge pull request #94 from clintbellanger/master

merge from main project
Rewrite nondiagonal side stepping code.
Fix jerky ally follow movement
Merge pull request #707 from RyanDansie/bug_fixes

Fix party buff issue
Merge pull request #713 from RyanDansie/ally_follow

Fix jerky ally follow movement
Merge branch 'floatingpointmovement' of https://github.com/stefanbeller/flare-engine into fp_movement