added ondodge, onblock, ongethit, onattack martial arts buff triggers
implemented MA armor buffs and reworked toad style to use them
various martial arts bugfixes

* technique damage mults/bonuses and buff damage mults now work
* removed block, bash_resist, cut_resist from techniques as they are no longer
used
various martial arts bugfixes

* technique damage mults/bonuses and buff damage mults now work
* removed block, bash_resist, cut_resist from techniques as they are no longer
used
Fixed ./cataclysm-launcher to work in non-bash environments

fixes #4705
z-order armor by location, now that it has a location.
Update lang/extract_json_strings.py.
Update the .pot file.
Merge https://github.com/CleverRaven/Cataclysm-DDA into martial_arts

Conflicts:
	src/martialarts.cpp
Merge branch 'martial_arts' of https://github.com/swwu/Cataclysm-DDA into martial_arts
Added ear plugs and noise cancelling headgear
Adds the public works building to defencs mode
Merge github.com:CleverRaven/Cataclysm-DDA into martial_arts
added some comments
Tidy up earplug code
compilation issue in msvc100 project

msvc100 project was looking for files outside of src/ directory.
also advanced_inv.cpp and ui.cpp needed to #include <iterator> to
recognize the back_inserter template
Protectors

Some of the scientists and soldiers apparently drank the water...
Correct json mismatches turned up by new cross-checks.
Tightened the spawning code

Kevin's suggestion worked fine and let me add guards to the drug deal
too.  (The 1/20 for Smokers is intentional.  I hate those things but
they seemed a good check, since drug spawns can drop *nice gear*.)

Tests look good so far.
Merge martial arts and cataclysm-launcher fixes.