Merge pull request #7624 from cdepatie/hotkey_conflict_fix

remove ? as a possible item hotkey in inventory
Botched update
Revert "Botched update"

This reverts commit 6d7bb8d62bbce8194a1cec0f073dc41cf22b7375.
Enable c++11 compilation and use a few of the features.
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod
Merge remote-tracking branch 'KA101/TheJob' into FrankenMod
Merge remote-tracking branch 'kevingranade/c-plusplus-11' into FrankenMod
Fix .cbp syntax.
Fixes to make compilation work with c++11. (#7626)
Removed -m3dnow, caused problem with c++11.
Merge remote-tracking branch 'kevingranade/c-plusplus-11' into FrankenMod