Merge branch 'master' of github.com:fiddlerwoaroof/Cataclysm-DDA

Conflicts:
	newcharacter.cpp