Simple Scrolling Combat Text animation
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Options rewrite Step 1
operator overload madness ...
Options rewrite Step 2
Added display/save/load
Options put in categories
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into options
Revertet some changes from another branch
missing file ..
Merge rewrite of options system.

Conflicts:
	game.cpp