Acidbomb crafting from batteries. Makes no sense, but eh.
Fix indentation in tent iuse function.
Implemented less stupid way of showing a limited inventory.

Added survival mag and mechanics textbook.

Conflicts:

	data/motd
	game.cpp
	itype.h
	itypedef.cpp
	mapitemsdef.cpp
Add code to collapse a tent when bashed.
Fixed a derp
Fixed acidbomb crafting
Did.. something
Merge branch 'master' of git://github.com/TheDarklingWolf/Cataclysm-DDA into for-darklingwolf