-minor contrib
Merge branch 'master' of https://github.com/iboB/evoshooter
+player weapon concept
Merge branch 'master' of https://github.com/iboB/evoshooter

Conflicts:
	build/vc12/evoshooter/evoshooter.vcxproj
	build/vc12/evoshooter/evoshooter.vcxproj.filters
	src/MonsterCharacter.cpp
	src/MonsterCharacter.h