Merge pull request #8 from rgarmsen2295/mm-1097

MM-1097

web/react/components/user_settings.jsx

@@ -658,9 +658,10 @@ var SecurityTab = React.createClass({
             );
         } else {
             var d = new Date(this.props.user.last_password_update);
-            var hour = d.getHours() < 10 ? "0" + d.getHours() : String(d.getHours());
+            var hour = d.getHours() % 12 ? String(d.getHours() % 12) : "12";
             var min = d.getMinutes() < 10 ? "0" + d.getMinutes() : String(d.getMinutes());
-            var dateStr = "Last updated " + Constants.MONTHS[d.getMonth()] + " " + d.getDate() + ", " + d.getFullYear() + " at " + hour + ":" + min;
+            var timeOfDay = d.getHours() >= 12 ? " pm" : " am";
+            var dateStr = "Last updated " + Constants.MONTHS[d.getMonth()] + " " + d.getDate() + ", " + d.getFullYear() + " at " + hour + ":" + min + timeOfDay;
 
             passwordSection = (
                 <SettingItemMin