Merged revision(s) 6894 from branches/ja2_source_official_2014:

Fixes (by Buggler)
- IMPPrejudice page not showing when reviewing in finish mode
- Added message when minor traits are unselectable due to all IMP available slots taken up by major traits
- Display message when pressing hotkey 'G' to toggle artificial merc light
- refactor hotkey weapon switching and make function available in OIV too
- hold ALT key to swap item instead of opening description box for valid attachment on cursor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6895 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Laptop/IMP Prejudice.cpp

@@ -375,7 +375,7 @@ void BtnIMPPrejudiceFinishCallback(GUI_BUTTON *btn,INT32 reason)
 			//go back tot he done screen
 			iCurrentImpPage = IMP_FINISH;
 		}
-		// Flugente: setting determines wether we see the background page
+		// Flugente: setting determines whether we see the background page
 		else
 		{
 			// we finished this -> write down our choices
@@ -409,7 +409,7 @@ void BtnIMPPrejudiceFinishCallback(GUI_BUTTON *btn,INT32 reason)
 BOOLEAN CameBackToPrejudicePageButNotFinished()
 {
 	//if we are in a page that comes after this one
-	if( iCurrentProfileMode == IMP__ATTRIBUTES )
+	if( iCurrentProfileMode == IMP__ATTRIBUTES || iCurrentProfileMode == IMP__PERSONALITY )
 	{
 		return( TRUE );
 	}