merge, comment fix, never-consistence fix

src/achievements/achievement_info.cpp

@@ -55,9 +55,7 @@ AchievementInfo::AchievementInfo(const XMLNode * input)
         m_reset_type = AFTER_RACE;
     else if (s == "lap")
         m_reset_type = AFTER_LAP;
-    else if (s == "never")
-        m_reset_type = NEVER;
-    else
+    else if (s != "never")
         Log::warn("AchievementInfo", "Achievement check type '%s' unknown.",
             s.c_str());
 

src/achievements/achievements_status.cpp

@@ -140,4 +140,4 @@ void AchievementsStatus::onLapEnd()
     for (iter = m_achievements.begin(); iter != m_achievements.end(); ++iter) {
         iter->second->onLapEnd();
     }
-}   // onRaceEnd
+}   // onLapEnd