Loading meridian locales from time key instead of date
Revert "Update master"

This reverts commit acdf0befb41638c3fc466b7fac89382055c90ee6.
Fixing unit tests for meridian
Reverting assets pipeline conditional
Merge pull request #1 from ulifigueroa/meridian-locale

Fixing meridian locale