Merge remote-tracking branch 'icambron/feature/language-chooser' into develop

Conflicts:
	moment.js

diff --cc moment.js
index f04d4a2fc4886ce5528e5689d3f7794d092a1423,b97e168839503c064257961686fe1e33f81e2bdb..0f74482a1ce46b763b5fc26763bd0dd41e0aad21
--- 1/moment.js
--- 2/moment.js
+++ b/moment.js
@@@ -471,65 -463,10 +472,69 @@@
          return value;
      }
  
 +    function daysInMonth(year, month) {
 +        return moment.utc([year, month + 1, 0]).date();
 +    }
 +
 +    function isLeapYear(year) {
 +        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
 +    }
 +
 +    function checkOverflow(m) {
 +        var overflow;
 +        if (m._a && m._pf.overflow === -2) {
 +            overflow =
 +                m._a[MONTH] < 0 || m._a[MONTH] > 11 ? MONTH :
 +                m._a[DATE] < 1 || m._a[DATE] > daysInMonth(m._a[YEAR], m._a[MONTH]) ? DATE :
 +                m._a[HOUR] < 0 || m._a[HOUR] > 23 ? HOUR :
 +                m._a[MINUTE] < 0 || m._a[MINUTE] > 59 ? MINUTE :
 +                m._a[SECOND] < 0 || m._a[SECOND] > 59 ? SECOND :
 +                m._a[MILLISECOND] < 0 || m._a[MILLISECOND] > 999 ? MILLISECOND :
 +                -1;
 +
 +            if (m._pf._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
 +                overflow = DATE;
 +            }
 +
 +            m._pf.overflow = overflow;
 +        }
 +    }
 +
 +    function initializeParsingFlags(config) {
 +        config._pf = {
 +            empty : false,
 +            unusedTokens : [],
 +            unusedInput : [],
 +            overflow : -2,
 +            charsLeftOver : 0,
 +            nullInput : false,
 +            invalidMonth : null,
 +            userInvalidated : false,
 +        };
 +    }
 +
 +    function isValid(m) {
 +        if (m._isValid == null) {
 +            m._isValid = !isNaN(m._d.getTime()) &&
 +                m._pf.overflow < 0 &&
 +                !m._pf.empty &&
 +                !m._pf.invalidMonth &&
 +                !m._pf.nullInput &&
 +                !m._pf.userInvalidated;
 +
 +            if (m._strict) {
 +                m._isValid = m._isValid &&
 +                    m._pf.charsLeftOver === 0 &&
 +                    m._pf.unusedTokens.length === 0;
 +            }
 +        }
 +        return m._isValid;
 +    }
 +
+     function normalizeLanguage(key) {
+         return key ? key.toLowerCase().replace('_', '-') : key;
+     }
+ 
      /************************************
          Languages
      ************************************/

diff --cc test/moment/lang.js
Simple merge