Merge branch 'develop' into develop_60fps

# Conflicts:
#	TombEngine/Game/control/control.cpp
#	TombEngine/Game/gui.cpp
#	TombEngine/Renderer/RendererDrawMenu.cpp
#	TombEngine/Scripting/Internal/TEN/Flow/FlowHandler.cpp

Scripts/Settings.lua

@@ -11,7 +11,6 @@ local anims = Flow.Animations.new()
 anims.crawlExtended = true
 anims.crouchRoll = true
 anims.crawlspaceSwandive = true
-anims.monkeyAutoJump = false
 anims.overhangClimb = false
 anims.slideExtended = false
 anims.sprintJump = false

Scripts/Strings.lua

@@ -58,7 +58,7 @@ local strings =
 	
 	-- Level name strings
 	
-	lara_home = { "Lara's Home" },
+	home_level = { "Home Level" },
 	test_level = { "Test Level" },
 	title = { "Title" },
 }

Scripts/SystemStrings.lua

@@ -51,7 +51,8 @@ local strings =
 	ammo_used = { "Ammo Used" },
 	antialiasing = { "Antialiasing" },
 	apply = { "Apply" },
-	automatic_targeting = { "Automatic Targeting" },
+	auto_monkey_swing_jump = { "Auto Monkey Jump" },
+	auto_targeting = { "Auto Targeting" },
 	back = { "Back" },
 	cancel = { "Cancel" },
 	caustics = { "Underwater Caustics" },
@@ -79,8 +80,11 @@ local strings =
 	low = { "Low" },
 	medium = { "Medium" },
 	menu_actions = { "Menu Actions" },
+	menu_option_looping = { "Menu Option Looping" },
+	menu_option_looping_all_menus = { "All Menus" },
+	menu_option_looping_disabled = { "Disabled" },
+	menu_option_looping_save_load_only = { "Save/Load Only" },
 	mouse_sensitivity = { "Mouse Sensitivity" },
-	mouse_smoothing = { "Mouse Smoothing" },
 	music_volume = { "Music Volume" },
 	new_game = { "New Game" },
 	none = { "None" },