Merge branch 'valium-boost' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Merge branch 'thorazine-recipe' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Merge branch 'royal-jelly-improvements' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Sorry I cannot brain today; I has the dumb.
Merge branch 'royal-jelly-improvements' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Merge remote-tracking branch 'KA101/master' into FrankenMod

Conflicts:
	src/iuse.cpp

Fixes and formatting.
Removed newline.