Purge tabs from output.cpp.
Ignore <color> tags when wrapping lines.
Publicize get_tag_positions() and make its argument const.
Implement inline <color> tags for fold_and_print().
Also allow shorthand colour names for json and colour tags.
Clean up veh_interact i18n using new inline colour tags.
Fixes fruit leather quench value.
Biscuit fix.
Some vehicles will now be created with their lights running.
inventory::clone_stack(const std::list<item> & stack); This is like inventory::add_stack, but
it does -not- use inventory::add_item(). This is because inventory::filter_by_category()
(which is only used in game::inv_type()) is essentially a display filter, exact stack copies
are needed, and invlets do not require -any- changes.

This is a temporary bugfix as game::inv* will be rewritten.
inventory_ui and player memorial: first restack inventory, -then- sort it.
This corrects the 'drank bottle of water and half drunk bottle disappears / moves to "other"' bug
in 'E'at / 'a'ctivate, 'i'nv
Allow hotplates to heat food, and condense food-heating code.
Make cancelling with a hotplate actually cancel.
Add spaces: "land mine", "booby trap", "bubble wrap".
added 4 more styles and self-defense training trait back in
Merge branch 'master' into martial_arts
I18n for mapgen.cpp.
Make cancel_activity query more easily translatable.
Update martialarts.json

Accidentally deleted capoeira, added it back in
Fixes jam sedative effect.