Merge pull request #1 from CleverRaven/master

updating local repo
Merge pull request #2 from CleverRaven/master

updating local repo
Merge pull request #3 from CleverRaven/master

updating local repo
Merge pull request #4 from ClockworkZombie/on_hit

merging branch as I'm struggling to find a way to delete it.
Merge branch 'on_hit' of https://github.com/ClockworkZombie/Cataclysm-DDA into on_hit

Conflicts:
	msvc110/Cataclysm.vcxproj
	src/mondefense.cpp