Fixed a gramatical error
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into personal_branch

Conflicts:
	lang/po/cataclysm-dda.pot
Merge branch 'personal_branch'
Making sure that all of my files are the same across my personal and master.