Close Quarter Battle Bionic... martial arts on demand.
tabs in the wrong places again
Did somebody says Quarters?
Did somebody says Kung-fu^H^H^H^H^H^H^HMuay Thai?
CQB Bionic now sets combat skills (melee, unarmed, bashing, cutting, stabbing) to 4 whilst active and disables learning.
fixed merge conflict
initial
restore conditional
restore conditional properly
committing WIP changes whilst merging to current
merged to upstream master, added compatibility for ssize_t on msvc via platform.h
bionic removal tweaking
Add special message for when a gun has no slot for a gunmod at all.
Added Biojutsu, a simple MA based on direct strikes and blocks. Karate but for monomolecular blades and claws.
Removed testing profession.
Removed remnant of technique bionic requirements (tried it, didn't like it).
added platform.h (MSVC compatibility for ssize_t)
Prevents hallucinations from bleeding from the MESSY weapons.
Merge branch 'remove-cbms' of https://github.com/dvolk/Cataclysm-DDA into DailyMegamerge

Conflicts:
	src/bionics.cpp

Looks like the two just happened to share space?
Merge branch 'chnage-gunmod-message' of https://github.com/BevapDin/Cataclysm-DDA into DailyMegamerge