trivial fix, and -> &&
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
C++11 compatability.
Adds catalua files to the C::B project
Sprinkle some compatibility.

Merge PRs #4432 and #4433.