A-style, tweak, and slightly rebalance scent move to be less generous to mobs.
Merge branch 'rebalance-scent' into no-more-wacky-scents
Better. Faster. Stronger scent(tm)(tm).
Merge branch 'scent-erase' into no-more-wacky-scents

Conflicts:
	src/game.cpp
Improve implementation by reducing the number of rand calls and if-statements.
Disable scent debug again.
Merge branch 'pr/4704'
Revert "Merge branch 'pr/4704'"

This reverts commit dc9e3408ff32d5980c6ec267d7694948c2459eef, reversing
changes made to 946b9c3fd10d6aa72883720d1feed54fe6066922.
Merge github.com:CleverRaven/Cataclysm-DDA into martial_arts
added some comments